streaming and 404

.changeset/few-pets-live.md

@@ -0,0 +1,5 @@
+---
+"@astro-aws/adapter": minor
+---
+
+Added AWS Lambda powertools

.changeset/serious-guests-switch.md

@@ -0,0 +1,6 @@
+---
+"@astro-aws/constructs": minor
+"@astro-aws/adapter": minor
+---
+
+Added support for 404 pages

.eslintrc.cjs

@@ -15,6 +15,7 @@ module.exports = {
 	rules: {
 		"import/no-useless-path-segments": "off",
 		"no-console": "off",
+		"no-warning-comments": "off",
 	},
 	settings: {
 		"import/parsers": {

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-	"cSpell.words": ["astro", "awslambda", "streamify"],
+	"cSpell.words": ["astro", "awslambda", "powertools", "streamify"],
 	"files.associations": {
 		"*.mdx": "markdown"
 	},

apps/infra/src/bin/infra.ts

@@ -6,16 +6,14 @@ import {
 } from "../lib/constants/environments.js"
 import { MonitoringStack } from "../lib/stacks/monitoring-stack.js"
 import { WebsiteStack } from "../lib/stacks/website-stack.js"
-import { RedirectStack } from "../lib/stacks/redirect-stack.js"
-import type { CertificateStackProps } from "../lib/stacks/certificate-stack.js"
 import { CertificateStack } from "../lib/stacks/certificate-stack.js"
 import { GitHubOIDCStack } from "../lib/stacks/github-oidc-stack.js"
 import { GitHubUsersStack } from "../lib/stacks/github-users-stack.js"
 
 const app = new App()
 
-const createStackName = (environment: string, stack: string) =>
-	`AstroAWS-${environment}-${stack}`
+const createStackName = (environment: string, stack: string, mode?: string) =>
+	["AstroAWS", environment, stack, mode].filter(Boolean).join("-")
 
 Object.entries(ENVIRONMENT_PROPS).forEach(([environment, environmentProps]) => {
 	const monitoringStack = new MonitoringStack(
@@ -24,15 +22,33 @@ Object.entries(ENVIRONMENT_PROPS).forEach(([environment, environmentProps]) => {
 		environmentProps,
 	)
 
-	let certificateStack: CertificateStack | undefined
+	environmentProps.websites.forEach((websiteProps) => {
+		let certificateStack: CertificateStack | undefined
 
-	if (environmentProps.hostedZoneName) {
-		certificateStack = new CertificateStack(
+		if (websiteProps.hostedZoneName && websiteProps.aliases) {
+			certificateStack = new CertificateStack(
+				app,
+				createStackName(environment, "Certificate", websiteProps.mode),
+				{
+					...environmentProps,
+					aliases: websiteProps.aliases,
+					hostedZoneName: websiteProps.hostedZoneName,
+				},
+			)
+		}
+
+		new WebsiteStack(
 			app,
-			createStackName(environment, "Certificate"),
-			environmentProps as CertificateStackProps,
+			createStackName(environment, "Website", websiteProps.mode),
+			{
+				...environmentProps,
+				...websiteProps,
+				certificate: certificateStack?.certificate,
+				cloudwatchDashboard: monitoringStack.cloudwatchDashboard,
+				hostedZone: certificateStack?.hostedZone,
+			},
 		)
-	}
+	})
 
 	if (environment === Environments.DEV) {
 		new GitHubUsersStack(
@@ -48,33 +64,6 @@ Object.entries(ENVIRONMENT_PROPS).forEach(([environment, environmentProps]) => {
 		)
 	}
 
-	new WebsiteStack(app, createStackName(environment, "Website"), {
-		...environmentProps,
-		certificate: certificateStack?.certificate,
-		cloudwatchDashboard: monitoringStack.cloudwatchDashboard,
-		hostedZone: certificateStack?.hostedZone,
-	})
-
-	if (environment === Environments.PROD && environmentProps.hostedZoneName) {
-		const redirectProps = {
-			...environmentProps,
-			alias: ["www", environmentProps.alias].filter(Boolean).join("."),
-		}
-
-		const redirectCertificateStack = new CertificateStack(
-			app,
-			createStackName(environment, "RedirectCertificate"),
-			redirectProps as CertificateStackProps,
-		)
-
-		new RedirectStack(app, createStackName(environment, "Redirect"), {
-			...redirectProps,
-			certificate: redirectCertificateStack.certificate,
-			cloudwatchDashboard: monitoringStack.cloudwatchDashboard,
-			hostedZone: redirectCertificateStack.hostedZone,
-		})
-	}
-
 	Tags.of(app).add("Project", "AstroAWS")
 	Tags.of(app).add("Environment", environment)
 })

apps/infra/src/lib/constants/environments.ts

@@ -1,6 +1,7 @@
 import { env } from "node:process"
 
 import type { AstroAWSStackProps } from "../types/astro-aws-stack-props.js"
+import { type StaticWebsiteStackProps } from "../stacks/website-stack.js"
 
 const base = {
 	analyticsReporting: false,
@@ -14,61 +15,82 @@ const base = {
 
 const Environments = {
 	DEV: "DEV",
-	EDGE: "EDGE",
 	PERSONAL: "PERSONAL",
 	PROD: "PROD",
-	SSR: "SSR",
-	STREAM: "STREAM",
 } as const
 
 type Environment = (typeof Environments)[keyof typeof Environments]
 
-const ENVIRONMENT_PROPS: Record<Environment, AstroAWSStackProps> = {
+type EnvironmentProps = Readonly<
+	AstroAWSStackProps & {
+		websites: readonly (Partial<AstroAWSStackProps> & StaticWebsiteStackProps)[]
+	}
+>
+
+const ENVIRONMENT_PROPS: Record<Environment, EnvironmentProps> = {
 	[Environments.DEV]: {
 		...base,
-		alias: "static.dev",
 		environment: Environments.DEV,
-		hostedZoneName: "astro-aws.org",
-		package: "@astro-aws/docs",
-	},
-	[Environments.EDGE]: {
-		...base,
-		alias: "edge.dev",
-		distDir: "dist/edge",
-		env: {
-			...base.env,
-			region: "us-east-1",
-		},
-		environment: Environments.EDGE,
-		hostedZoneName: "astro-aws.org",
-		package: "@astro-aws/examples-base",
+		websites: [
+			{
+				aliases: ["www.static.dev", "static.dev"],
+				hostedZoneName: "astro-aws.org",
+				mode: "static",
+				package: "@astro-aws/docs",
+			},
+			{
+				aliases: ["www.ssr.dev", "ssr.dev"],
+				hostedZoneName: "astro-aws.org",
+				mode: "ssr",
+				package: "@astro-aws/examples-base",
+			},
+			{
+				aliases: ["www.stream.dev", "stream.dev"],
+				hostedZoneName: "astro-aws.org",
+				mode: "ssr-stream",
+				package: "@astro-aws/examples-base",
+			},
+			{
+				aliases: ["www.edge.dev", "edge.dev"],
+				env: {
+					...base.env,
+					region: "us-east-1",
+				},
+				hostedZoneName: "astro-aws.org",
+				mode: "edge",
+				package: "@astro-aws/examples-base",
+			},
+		],
 	},
 	[Environments.PROD]: {
 		...base,
 		environment: Environments.PROD,
-		hostedZoneName: "astro-aws.org",
-		package: "@astro-aws/docs",
+		websites: [
+			{
+				aliases: ["www", "*"],
+				hostedZoneName: "astro-aws.org",
+				mode: "static",
+				package: "@astro-aws/docs",
+			},
+		],
 	},
 	[Environments.PERSONAL]: {
 		...base,
 		environment: Environments.PERSONAL,
-		package: "@astro-aws/docs",
-	},
-	[Environments.SSR]: {
-		...base,
-		alias: "ssr.dev",
-		distDir: "dist/ssr",
-		environment: Environments.SSR,
-		hostedZoneName: "astro-aws.org",
-		package: "@astro-aws/examples-base",
-	},
-	[Environments.STREAM]: {
-		...base,
-		alias: "stream.dev",
-		distDir: "dist/ssr-stream",
-		environment: Environments.STREAM,
-		hostedZoneName: "astro-aws.org",
-		package: "@astro-aws/examples-base",
+		websites: [
+			{
+				mode: "static",
+				package: "@astro-aws/docs",
+			},
+			{
+				mode: "ssr",
+				package: "@astro-aws/examples-base",
+			},
+			{
+				mode: "ssr-stream",
+				package: "@astro-aws/examples-base",
+			},
+		],
 	},
 } as const
 

apps/infra/src/lib/constructs/basic-graph-widget.ts

@@ -1,5 +1,5 @@
 import type { GraphWidgetProps, Metric } from "aws-cdk-lib/aws-cloudwatch"
-import { GraphWidget } from "aws-cdk-lib/aws-cloudwatch"
+import { GRID_WIDTH, GraphWidget } from "aws-cdk-lib/aws-cloudwatch"
 
 export type BasicGraphWidgetProps = Omit<
 	GraphWidgetProps,
@@ -13,7 +13,7 @@ export class BasicGraphWidget extends GraphWidget {
 		const { metric, ...graphWidgetProps } = props
 
 		super({
-			width: 12,
+			width: GRID_WIDTH / 2,
 			...graphWidgetProps,
 			left: [metric],
 			title: metric.label,

apps/infra/src/lib/stacks/certificate-stack.ts

@@ -10,6 +10,7 @@ import { HostedZone } from "aws-cdk-lib/aws-route53"
 import type { AstroAWSStackProps } from "../types/astro-aws-stack-props.js"
 
 export type CertificateStackProps = AstroAWSStackProps & {
+	aliases: readonly [string, ...string[]]
 	hostedZoneName: string
 }
 
@@ -30,16 +31,18 @@ export class CertificateStack extends Stack {
 			},
 		})
 
-		const { hostedZoneName, alias } = props
-
-		const domainName = [alias, hostedZoneName].filter(Boolean).join(".")
+		const { hostedZoneName, aliases } = props
+		const [domainName, ...restDomainNames] = aliases.map((alias) =>
+			[alias, hostedZoneName].join("."),
+		) as [string, ...string[]]
 
 		this.hostedZone = HostedZone.fromLookup(this, "HostedZone", {
 			domainName: hostedZoneName,
 		})
 
 		this.certificate = new Certificate(this, "Certificate", {
 			domainName,
+			subjectAlternativeNames: restDomainNames,
 			validation: CertificateValidation.fromDns(this.hostedZone),
 		})
 	}