Merge pull request #242 from nitrictech/feature/memory-support

Author: davemooreuws

packages/common/src/stack/schema.ts

@@ -1572,6 +1572,7 @@ export const STACK_SCHEMA: JSONSchema7 = {
 						},
 						handler: { type: 'string' },
 						context: { type: 'string' },
+						memory: { type: 'number' },
 						excludes: {
 							type: 'array',
 							items: {
@@ -1612,6 +1613,7 @@ export const STACK_SCHEMA: JSONSchema7 = {
 					properties: {
 						dockerfile: { type: 'string' },
 						context: { type: 'string' },
+						memory: { type: 'number' },
 						args: {
 							type: 'object',
 							additionalProperties: { type: 'string' },

packages/common/src/types/compute/unit.ts

@@ -20,6 +20,8 @@ export interface NitricComputeUnit<Ext extends Record<string, any> = never> {
 	context?: string;
 	// Triggers used to invoke this compute unit, e.g. Topic Subscriptions
 	triggers?: NitricComputeUnitTriggers;
+	// The memory of the compute instance in MB
+	memory?: number;
 	// The minimum number of instances to keep alive
 	minScale?: number;
 	// The maximum number of instances to scale to

packages/plugins/aws/src/resources/compute.ts

@@ -32,12 +32,6 @@ interface NitricComputeAwsLambdaArgs {
 	 */
 	topics: NitricSnsTopic[];
 
-	/**
-	 * The amount of provisioned memory
-	 * defaults to 128
-	 */
-	memory?: pulumi.Input<number>;
-
 	/**
 	 * The timeout for the func in seconds
 	 * defaults to 15
@@ -55,7 +49,8 @@ export class NitricComputeAWSLambda extends pulumi.ComponentResource {
 	constructor(name, args: NitricComputeAwsLambdaArgs, opts?: pulumi.ComponentResourceOptions) {
 		super('nitric:func:AWSLambda', name, {}, opts);
 
-		const { source, image, topics, timeout = 15, memory = 128 } = args;
+		const { source, image, topics, timeout = 15 } = args;
+		const { memory = 128 } = source.getDescriptor();
 		const defaultResourceOptions: pulumi.ResourceOptions = { parent: this };
 
 		this.name = source.getName();