✨ feat(region & remove): allow for specifying of region and add remove command (fix #68, fix #69)

fix #68, fix #69

Author: sladg

Diff for: lib/cdk/app.ts

@@ -1,11 +1,9 @@
 import { App } from 'aws-cdk-lib'
 import path from 'path'
 import { NextStandaloneStack } from './stack'
-import {
-	DEFAULT_TIMEOUT as IMAGE_LAMBDA_DEFAULT_TIMEOUT,
-	DEFAULT_MEMORY as IMAGE_LAMBDA_DEFAULT_MEMORY,
-} from './utils/imageLambda'
+import { DEFAULT_TIMEOUT as IMAGE_LAMBDA_DEFAULT_TIMEOUT, DEFAULT_MEMORY as IMAGE_LAMBDA_DEFAULT_MEMORY } from './utils/imageLambda'
 import { handler, name, optimizerCodePath, optimizerLayerPath, version } from '@sladg/imaginex-lambda'
+import { DEFAULT_TIMEOUT as SERVER_LAMBDA_DEFAULT_TIMEOUT, DEFAULT_MEMORY as SERVER_LAMBDA_DEFAULT_MEMORY } from './utils/serverLambda'
 
 const app = new App()
 
@@ -32,16 +30,16 @@ new NextStandaloneStack(app, process.env.STACK_NAME, {
 	apigwServerPath: '/_server',
 	apigwImagePath: '/_image',
 
-	lambdaTimeout: process.env.LAMBDA_TIMEOUT ? Number(process.env.LAMBDA_TIMEOUT) : 15,
-	lambdaMemory: process.env.LAMBDA_MEMORY ? Number(process.env.LAMBDA_MEMORY) : 1024,
+	lambdaTimeout: process.env.LAMBDA_TIMEOUT ? Number(process.env.LAMBDA_TIMEOUT) : SERVER_LAMBDA_DEFAULT_TIMEOUT,
+	lambdaMemory: process.env.LAMBDA_MEMORY ? Number(process.env.LAMBDA_MEMORY) : SERVER_LAMBDA_DEFAULT_MEMORY,
 	imageLambdaTimeout: process.env.LAMBDA_TIMEOUT ? Number(process.env.IMAGE_LAMBDA_TIMEOUT) : IMAGE_LAMBDA_DEFAULT_TIMEOUT,
 	imageLambdaMemory: process.env.LAMBDA_MEMORY ? Number(process.env.IMAGE_LAMBDA_MEMORY) : IMAGE_LAMBDA_DEFAULT_MEMORY,
 	hostedZone: process.env.HOSTED_ZONE ?? undefined,
 	dnsPrefix: process.env.DNS_PREFIX ?? undefined,
 	customApiDomain: process.env.CUSTOM_API_DOMAIN ?? undefined,
 	env: {
 		account: process.env.CDK_DEFAULT_ACCOUNT,
-		region: process.env.CDK_DEFAULT_REGION,
+		region: process.env.AWS_REGION ?? process.env.CDK_DEFAULT_REGION,
 	},
 })
 

Diff for: lib/cdk/utils/imageLambda.ts

@@ -12,10 +12,13 @@ export interface SetupImageLambdaProps {
 	timeout?: number
 }
 
-export const DEFAULT_MEMORY = 256
+export const DEFAULT_MEMORY = 512
 export const DEFAULT_TIMEOUT = 10
 
-export const setupImageLambda = (scope: Stack, { assetsBucket, codePath, handler, layerPath, lambdaHash, memory = DEFAULT_MEMORY, timeout = DEFAULT_TIMEOUT }: SetupImageLambdaProps) => {
+export const setupImageLambda = (
+	scope: Stack,
+	{ assetsBucket, codePath, handler, layerPath, lambdaHash, memory = DEFAULT_MEMORY, timeout = DEFAULT_TIMEOUT }: SetupImageLambdaProps,
+) => {
 	const depsLayer = new LayerVersion(scope, 'ImageOptimizationLayer', {
 		code: Code.fromAsset(layerPath, {
 			assetHash: lambdaHash + '_layer',

Diff for: lib/cdk/utils/serverLambda.ts

@@ -10,7 +10,13 @@ export interface SetupServerLambdaProps {
 	timeout: number
 }
 
-export const setupServerLambda = (scope: Stack, { basePath, codePath, dependenciesPath, handler, memory, timeout }: SetupServerLambdaProps) => {
+export const DEFAULT_MEMORY = 1024
+export const DEFAULT_TIMEOUT = 20
+
+export const setupServerLambda = (
+	scope: Stack,
+	{ basePath, codePath, dependenciesPath, handler, memory = DEFAULT_MEMORY, timeout = DEFAULT_TIMEOUT }: SetupServerLambdaProps,
+) => {
 	const depsLayer = new LayerVersion(scope, 'DepsLayer', {
 		// This folder does not use Custom hash as depenendencies are most likely changing every time we deploy.
 		code: Code.fromAsset(dependenciesPath),

Diff for: lib/cli.ts

@@ -6,10 +6,9 @@ import packageJson from '../package.json'
 import { deployHandler } from './cli/deploy'
 import { packHandler } from './cli/pack'
 import { wrapProcess } from './utils'
-import {
-	DEFAULT_TIMEOUT as IMAGE_LAMBDA_DEFAULT_TIMEOUT,
-	DEFAULT_MEMORY as IMAGE_LAMBDA_DEFAULT_MEMORY,
-} from './cdk/utils/imageLambda'
+import { DEFAULT_TIMEOUT as IMAGE_LAMBDA_DEFAULT_TIMEOUT, DEFAULT_MEMORY as IMAGE_LAMBDA_DEFAULT_MEMORY } from './cdk/utils/imageLambda'
+import { removeHandler } from './cli/remove'
+import { DEFAULT_REGION } from './consts'
 
 const commandCwd = process.cwd()
 const program = new Command()
@@ -46,6 +45,7 @@ program
 	.action(async (options) => {
 		console.log('Our config is: ', options)
 		const { standaloneFolder, publicFolder, handlerPath, outputFolder } = options
+
 		wrapProcess(packHandler({ commandCwd, handlerPath, outputFolder, publicFolder, standaloneFolder }))
 	})
 
@@ -55,17 +55,58 @@ program
 	.option('--stackName <name>', 'Name of the stack to be deployed.', 'StandaloneNextjsStack-Temporary')
 	.option('--appPath <path>', 'Absolute path to app.', path.resolve(__dirname, '../dist/cdk/app.js'))
 	.option('--bootstrap', 'Bootstrap CDK stack.', false)
+	.option('--region <region>', 'AWS region to deploy to.', DEFAULT_REGION)
 	.option('--lambdaTimeout <sec>', 'Set timeout for lambda function handling server requests.', Number, 15)
 	.option('--lambdaMemory <mb>', 'Set memory for lambda function handling server requests.', Number, 512)
 	.option('--imageLambdaTimeout <sec>', 'Set timeout for lambda function handling image optimization.', Number, IMAGE_LAMBDA_DEFAULT_TIMEOUT)
 	.option('--imageLambdaMemory <mb>', 'Set memory for lambda function handling image optimization.', Number, IMAGE_LAMBDA_DEFAULT_MEMORY)
 	.option('--hostedZone <domainName>', 'Hosted zone domain name to be used for creating DNS records (example: example.com).', undefined)
 	.option('--domainNamePrefix <prefix>', 'Prefix for creating DNS records, if left undefined, hostedZone will be used (example: app).', undefined)
-	.option('--customApiDomain <domain>', 'Domain to forward the requests to /api routes, if left undefined, API routes will be handled by the server lambda.', undefined)
+	.option('--customApiDomain <domain>', 'Domain to forward the requests to /api routes, by default API routes will be handled by the server lambda.', undefined)
+	.action(async (options) => {
+		console.log('Our config is: ', options)
+		const {
+			stackName,
+			appPath,
+			bootstrap,
+			region,
+			lambdaTimeout,
+			lambdaMemory,
+			imageLambdaMemory,
+			imageLambdaTimeout,
+			hostedZone,
+			domainNamePrefix,
+			customApiDomain,
+		} = options
+
+		wrapProcess(
+			deployHandler({
+				stackName,
+				appPath,
+				bootstrap,
+				region,
+				lambdaTimeout,
+				lambdaMemory,
+				imageLambdaMemory,
+				imageLambdaTimeout,
+				hostedZone,
+				domainNamePrefix,
+				customApiDomain,
+			}),
+		)
+	})
+
+program
+	.command('remove')
+	.description('Remove Next application via CDK')
+	.option('--stackName <name>', 'Name of the stack to be deployed.', 'StandaloneNextjsStack-Temporary')
+	.option('--appPath <path>', 'Absolute path to app.', path.resolve(__dirname, '../dist/cdk/app.js'))
+	.option('--region <region>', 'AWS region to deploy to.', DEFAULT_REGION)
 	.action(async (options) => {
 		console.log('Our config is: ', options)
-		const { stackName, appPath, bootstrap, lambdaTimeout, lambdaMemory, imageLambdaMemory, imageLambdaTimeout, hostedZone, domainNamePrefix, customApiDomain } = options
-		wrapProcess(deployHandler({ stackName, appPath, bootstrap, lambdaTimeout, lambdaMemory, imageLambdaMemory, imageLambdaTimeout, hostedZone, domainNamePrefix, customApiDomain }))
+		const { stackName, appPath, region } = options
+
+		wrapProcess(removeHandler({ stackName, appPath, region }))
 	})
 
 program.parse(process.argv)

Diff for: lib/cli/deploy.ts

@@ -4,6 +4,7 @@ interface Props {
 	stackName: string
 	appPath: string
 	bootstrap: boolean
+	region: string
 	lambdaMemory?: number
 	lambdaTimeout?: number
 	imageLambdaMemory?: number
@@ -15,13 +16,26 @@ interface Props {
 
 const cdkExecutable = require.resolve('aws-cdk/bin/cdk')
 
-export const deployHandler = async ({ stackName, appPath, bootstrap, lambdaMemory, lambdaTimeout, imageLambdaMemory, imageLambdaTimeout, domainNamePrefix, hostedZone, customApiDomain }: Props) => {
+export const deployHandler = async ({
+	stackName,
+	appPath,
+	bootstrap,
+	region,
+	lambdaMemory,
+	lambdaTimeout,
+	imageLambdaMemory,
+	imageLambdaTimeout,
+	domainNamePrefix,
+	hostedZone,
+	customApiDomain,
+}: Props) => {
 	// All paths are absolute.
 	const cdkApp = `node ${appPath}`
 	const cdkCiFlags = `--require-approval never --ci`
 
 	const variables = {
 		STACK_NAME: stackName,
+		...(region && { AWS_REGION: region }),
 		...(lambdaMemory && { LAMBDA_MEMORY: lambdaMemory.toString() }),
 		...(lambdaTimeout && { LAMBDA_TIMEOUT: lambdaTimeout.toString() }),
 		...(imageLambdaMemory && { IMAGE_LAMBDA_MEMORY: imageLambdaMemory.toString() }),

Diff for: lib/cli/remove.ts

@@ -0,0 +1,24 @@
+import { executeAsyncCmd } from '../utils'
+
+interface Props {
+	stackName: string
+	appPath: string
+	region: string
+}
+
+const cdkExecutable = require.resolve('aws-cdk/bin/cdk')
+
+export const removeHandler = async ({ appPath, stackName, region }: Props) => {
+	const cdkApp = `node ${appPath}`
+	const cdkCiFlags = `--force --ci`
+
+	const variables = {
+		STACK_NAME: stackName,
+		AWS_REGION: region,
+	}
+
+	await executeAsyncCmd({
+		cmd: `${cdkExecutable} destroy --app "${cdkApp}" ${cdkCiFlags}`,
+		env: variables,
+	})
+}

Diff for: lib/consts.ts

@@ -1 +1,3 @@
 export const nextServerConfigRegex = /(?<=conf: )(.*)(?=,)/
+
+export const DEFAULT_REGION = 'eu-central-1'