Adding fields to sam init for SAM CLI 0.30.0 (#786)

* Adding --app-template and --dependency-manager args for SAM CLI 0.30.0+

* Corrected spelling

* Changelog entry

* Wrong switch/case syntax

Author: bryceitoc9

.changes/next-release/Feature-9aab7d6c-d0f3-420c-8f03-a543a276773a.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Adding support for SAM CLI 0.30.0 features in `sam init`: --app-template and --dependency-manager"
+}

package-lock.json

@@ -7,7 +7,7 @@ import * as assert from 'assert'
 import { mkdirpSync, readFileSync, removeSync } from 'fs-extra'
 import * as path from 'path'
 import * as vscode from 'vscode'
-import { SamLambdaRuntime } from '../../src/lambda/models/samLambdaRuntime'
+import { getDependencyManager, SamLambdaRuntime } from '../../src/lambda/models/samLambdaRuntime'
 import { getSamCliContext } from '../../src/shared/sam/cli/samCliContext'
 import { runSamCliInit, SamCliInitArgs } from '../../src/shared/sam/cli/samCliInit'
 import { assertThrowsError } from '../../src/test/shared/utilities/assertUtils'
@@ -130,10 +130,12 @@ for (const runtime of runtimes) {
             tryRemoveProjectFolder()
             mkdirpSync(projectFolder)
             // this is really test 1, but since it has to run before everything it's in the before section
+            const runtimeArg = projectSDK as SamLambdaRuntime
             const initArguments: SamCliInitArgs = {
                 name: 'testProject',
                 location: projectFolder,
-                runtime: projectSDK as SamLambdaRuntime
+                runtime: runtimeArg,
+                dependencyManager: getDependencyManager(runtimeArg)
             }
             const samCliContext = getSamCliContext()
             await runSamCliInit(initArguments, samCliContext)
@@ -158,10 +160,12 @@ for (const runtime of runtimes) {
         })
 
         it('Fails to create template when it already exists', async () => {
+            const runtimeArg = projectSDK as SamLambdaRuntime
             const initArguments: SamCliInitArgs = {
                 name: 'testProject',
                 location: projectFolder,
-                runtime: projectSDK as SamLambdaRuntime
+                runtime: runtimeArg,
+                dependencyManager: getDependencyManager(runtimeArg)
             }
             console.log(initArguments.location)
             const samCliContext = getSamCliContext()

src/integrationTest/sam.test.ts

@@ -18,6 +18,7 @@ import { METADATA_FIELD_NAME, MetadataResult } from '../../shared/telemetry/tele
 import { makeCheckLogsMessage } from '../../shared/utilities/messages'
 import { ChannelLogger } from '../../shared/utilities/vsCodeUtils'
 import { addFolderToWorkspace } from '../../shared/utilities/workspaceUtils'
+import { getDependencyManager } from '../models/samLambdaRuntime'
 import {
     CreateNewSamAppWizard,
     CreateNewSamAppWizardResponse,
@@ -86,11 +87,16 @@ export async function createNewSamApplication(
 
         results.runtime = config.runtime
 
+        // TODO: Make this selectable in the wizard to account for runtimes with multiple dependency managers
+        const dependencyManager = getDependencyManager(config.runtime)
+
         const initArguments: SamCliInitArgs = {
             name: config.name,
             location: config.location.fsPath,
-            runtime: config.runtime
+            runtime: config.runtime,
+            dependencyManager
         }
+
         await runSamCliInit(initArguments, samCliContext)
 
         results.result = 'pass'

src/lambda/commands/createNewSamApp.ts

@@ -18,6 +18,25 @@ export const samLambdaRuntimes: immutable.Set<SamLambdaRuntime> = immutable.Set(
     'dotnetcore2.1'
 ] as SamLambdaRuntime[])
 
+export type DependencyManager = 'cli-package' | 'mod' | 'gradle' | 'pip' | 'npm' | 'maven' | 'bundler'
+
+// TODO: Make this return an array of DependencyManagers when we add runtimes with multiple dependency managers
+export function getDependencyManager (runtime: SamLambdaRuntime): DependencyManager {
+    switch (runtime) {
+        case 'nodejs10.x':
+        case 'nodejs8.10':
+            return 'npm'
+        case 'python2.7':
+        case 'python3.6':
+        case 'python3.7':
+            return 'pip'
+        case 'dotnetcore2.1':
+            return 'cli-package'
+        default:
+            throw new Error(`Runtime ${runtime} does not have an associated DependencyManager`)
+    }
+}
+
 export enum SamLambdaRuntimeFamily {
     Python,
     NodeJS,

src/lambda/models/samLambdaRuntime.ts

@@ -4,7 +4,7 @@
  */
 
 import * as semver from 'semver'
-import { SamLambdaRuntime } from '../../../lambda/models/samLambdaRuntime'
+import { DependencyManager, SamLambdaRuntime } from '../../../lambda/models/samLambdaRuntime'
 import { getSamCliVersion, SamCliContext } from './samCliContext'
 import { logAndThrowIfUnexpectedExitCode } from './samCliInvokerUtils'
 import { SAM_CLI_VERSION_0_30 } from './samCliValidator'
@@ -13,6 +13,7 @@ export interface SamCliInitArgs {
     runtime: SamLambdaRuntime
     location: string
     name: string
+    dependencyManager: DependencyManager
 }
 
 export async function runSamCliInit(initArguments: SamCliInitArgs, context: SamCliContext): Promise<void> {
@@ -21,6 +22,8 @@ export async function runSamCliInit(initArguments: SamCliInitArgs, context: SamC
 
     if (semver.gte(samCliVersion, SAM_CLI_VERSION_0_30)) {
         args.push('--no-interactive')
+        args.push('--app-template', 'hello-world')
+        args.push('--dependency-manager', initArguments.dependencyManager)
     }
 
     const childProcessResult = await context.invoker.invoke({

src/shared/sam/cli/samCliInit.ts

@@ -66,7 +66,8 @@ describe('runSamCliInit', async () => {
     const sampleSamInitArgs: SamCliInitArgs = {
         name: 'qwerty',
         location: '/some/path/to/code.js',
-        runtime: 'nodejs8.10'
+        runtime: 'nodejs8.10',
+        dependencyManager: 'npm'
     }
 
     it('Passes init command to sam cli', async () => {