Merge pull request #20 from nitric-dev/develop

Release latest CLI version

Author: jyecusch

packages/base/.gitignore

@@ -6,3 +6,4 @@
 /package-lock.json
 /tmp
 node_modules
+oclif.manifest.json

packages/base/oclif.manifest.json

@@ -1,7 +1,14 @@
 import { Command, flags } from '@oclif/command';
 import { wrapTaskForListr } from '@nitric/cli-common';
 import { MakeFunctionTask } from '../../tasks/make';
+import { getAvailableTemplates } from '../../utils';
 import Listr from 'listr';
+import inquirer from 'inquirer';
+
+interface MakeFunctionArgs {
+	template: string;
+	name: string;
+}
 
 export default class Function extends Command {
 	static description = 'Builds a nitric function';
@@ -23,22 +30,40 @@ export default class Function extends Command {
 	static args = [
 		{
 			name: 'template',
-			required: true,
-			description: 'template name to generate function from',
+			required: false,
+			description: 'Function template',
+			choices: getAvailableTemplates(),
 		},
 		{
 			name: 'name',
-			required: true,
-			description: 'the name of the new function to create',
+			required: false,
+			description: 'Function name',
 		},
 	];
 
 	async run(): Promise<void> {
 		const { args, flags } = this.parse(Function);
-		const { template, name } = args;
-		const { directory = '.', file = './nitric.yaml' } = flags;
+		// Prompt for any args that weren't provided in the command
+		const prompts = Function.args
+			.filter((arg) => !args[arg.name])
+			.map((arg) => {
+				const prompt = {
+					name: arg.name,
+					message: arg.description,
+					type: 'string',
+				};
+				if (arg.choices) {
+					prompt.type = 'list';
+					prompt['choices'] = arg.choices;
+				}
+				return prompt;
+			});
+		const promptArgs = await inquirer.prompt(prompts);
+
+		const { template, name } = { ...args, ...promptArgs } as MakeFunctionArgs;
+		const { directory = `./${name}`, file = './nitric.yaml' } = flags;
 
-		const functionDirectoryName = (name as string)
+		const functionName = (name as string)
 			.toLowerCase()
 			.replace(/ /g, '-')
 			.replace(/[^-a-z\d]/g, '');
@@ -48,7 +73,7 @@ export default class Function extends Command {
 				new MakeFunctionTask({
 					template,
 					dir: directory,
-					name: functionDirectoryName,
+					name: functionName,
 					file,
 				}),
 			),

packages/base/src/commands/make/function.ts

@@ -1,6 +1,7 @@
 import { Command, flags } from '@oclif/command';
 import { wrapTaskForListr } from '@nitric/cli-common';
 import { MakeProject, MakeFunctionTask } from '../../tasks/make';
+import { getAvailableTemplates } from '../../utils';
 import Listr, { ListrTask } from 'listr';
 import inquirer from 'inquirer';
 
@@ -35,7 +36,7 @@ export default class Project extends Command {
 				name: 'example',
 				message: 'Include an example function?',
 				type: 'list',
-				choices: [{ name: 'nodejs12' }, { name: 'python37' }, { name: 'none' }],
+				choices: getAvailableTemplates(),
 			},
 		]);
 

packages/base/src/commands/make/project.ts

@@ -78,8 +78,15 @@ async function runContainers(stack: NitricStack, portStart: number, directory: s
 		await Promise.all(
 			Object.values(currentRunResults).map(async (container) => {
 				// FIXME: only attempt to stop if currently running
-				await container.stop();
-				return container.remove();
+				if (container && container.stop) {
+					try {
+						await container.stop();
+					} catch (error) {
+						// TODO: Possibly log error for the container
+					} finally {
+						await container.remove();
+					}
+				}
 			}),
 		);
 	}
@@ -91,6 +98,17 @@ async function runContainers(stack: NitricStack, portStart: number, directory: s
 	const rangeLength = images.length * 2;
 	const portRange = getPort.makeRange(portStart, portStart + rangeLength);
 
+	// Sort the images by the names of their functions, to ensure a more predicatable order between reloads.
+	images.sort(({ func: { name: nameA } }, { func: { name: nameB } }) => {
+		if (nameA < nameB) {
+			return -1;
+		}
+		if (nameA > nameB) {
+			return 1;
+		}
+		return 0;
+	});
+
 	const runTaskOptions = await Promise.all(
 		images.map(async (image) => {
 			return {
@@ -168,8 +186,15 @@ export default class Run extends Command {
 						if (runResults) {
 							await Promise.all(
 								Object.values(runResults).map(async (container) => {
-									await container.stop();
-									return container.remove();
+									if (container && container.stop) {
+										try {
+											await container.stop();
+										} catch (error) {
+											// console.log("there was an error stopping this container");
+										} finally {
+											await container.remove();
+										}
+									}
 								}),
 							);
 						}

packages/base/src/commands/run.ts

@@ -40,9 +40,9 @@ export class MakeFunctionTask extends Task<void> {
 		const inPath = templateFunctionPath(this.template);
 		//TODO: should probably do something to make sure the file exists
 		// Make a copy of the function template, using the new name in the output directory
-		const outPath = path.join(this.dir, this.functionName);
+		const outPath = path.join(this.dir);
 		if (fs.existsSync(outPath)) {
-			throw new Error(`Function directory already exists: ${this.functionName}`);
+			throw new Error(`Function directory already exists: ${this.dir}`);
 		}
 
 		const outStream = tar.extract(outPath);
@@ -55,16 +55,11 @@ export class MakeFunctionTask extends Task<void> {
 
 	async do(): Promise<void> {
 		this.update('Checking stack descriptor');
-		const nitricFile = path.join(this.dir, this.file);
+		const nitricFile = this.file;
 		const stack = readNitricDescriptor(nitricFile);
 
 		const { functions = [] } = stack;
 
-		const funcDirName = this.functionName
-			.toLowerCase()
-			.replace(/ /g, '-')
-			.replace(/[^-a-z\d]/g, '');
-
 		if (functions.find((func) => func.name === this.functionName) !== undefined) {
 			throw new Error(`Function ${this.functionName} already defined in ${this.file}`);
 		}
@@ -74,7 +69,7 @@ export class MakeFunctionTask extends Task<void> {
 		await this.makeFunction();
 		//then
 
-		const functionFolder = path.join(this.dir, funcDirName);
+		const functionFolder = this.dir;
 		const nitricFileDir = path.dirname(nitricFile);
 
 		this.update(`Updating ${this.file}`);

packages/base/src/tasks/make/function.ts

@@ -10,6 +10,15 @@ export function isTemplateAvailable(templateName: string): boolean {
 	return fs.existsSync(templateDirectory);
 }
 
+export function getAvailableTemplates(): string[] {
+	return fs
+		.readdirSync(TEMPLATE_DIR, {
+			withFileTypes: true,
+		})
+		.filter((dirent) => dirent.isDirectory())
+		.map((dirent) => dirent.name);
+}
+
 export function createNitricLogDir(): void {
 	if (!fs.existsSync(LOG_DIR)) {
 		fs.mkdirSync(LOG_DIR);