new release

apps/infra/src/bin/infra.ts

@@ -43,7 +43,7 @@ Object.entries(ENVIRONMENT_PROPS).forEach(([environment, environmentProps]) => {
 			},
 		)
 
-		if (websiteProps.redirectAliases && websiteProps.hostedZoneName) {
+		if (websiteProps.redirectAliases) {
 			new RedirectStack(
 				app,
 				createStackName(
@@ -55,7 +55,8 @@ Object.entries(ENVIRONMENT_PROPS).forEach(([environment, environmentProps]) => {
 				{
 					...environmentProps,
 					aliases: websiteProps.redirectAliases,
-					hostedZoneName: websiteProps.hostedZoneName,
+					hostedZoneName: websiteProps.hostedZoneName!,
+					targetAlias: websiteProps.aliases![0],
 				},
 			)
 		}

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

@@ -101,7 +101,7 @@ const ENVIRONMENT_PROPS: Record<Environment, EnvironmentProps> = {
 				hostedZoneName: "astro-aws.org",
 				mode: "static",
 				app: "apps/docs",
-				redirectAliases: ["", "www", "docs", "www.docs"],
+				redirectAliases: ["", "docs", "www.docs"],
 				runtime: "nodejs20",
 			},
 		],

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

@@ -1,11 +1,15 @@
 import * as path from "node:path"
 
-import { Stack } from "aws-cdk-lib/core"
+import { RemovalPolicy, Stack } from "aws-cdk-lib/core"
 import {
+	CloudFrontWebDistribution,
 	Distribution,
 	Function,
 	FunctionCode,
 	FunctionEventType,
+	OriginProtocolPolicy,
+	PriceClass,
+	ViewerCertificate,
 	ViewerProtocolPolicy,
 } from "aws-cdk-lib/aws-cloudfront"
 import type { Construct } from "constructs"
@@ -17,14 +21,20 @@ import {
 } from "aws-cdk-lib/aws-route53"
 import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets"
 import { S3Origin } from "aws-cdk-lib/aws-cloudfront-origins"
-import { BlockPublicAccess, Bucket, BucketEncryption } from "aws-cdk-lib/aws-s3"
+import {
+	BlockPublicAccess,
+	Bucket,
+	BucketEncryption,
+	RedirectProtocol,
+} from "aws-cdk-lib/aws-s3"
 
 import type { AstroAWSStackProps } from "../types/astro-aws-stack-props.js"
 import { CrossRegionCertificate } from "../constructs/cross-region-certificate.js"
 
 export type RedirectStackProps = AstroAWSStackProps & {
 	hostedZoneName: string
 	aliases: [string, ...string[]]
+	targetAlias: string
 }
 
 export class RedirectStack extends Stack {
@@ -44,6 +54,9 @@ export class RedirectStack extends Stack {
 		})
 
 		const [domainName, ...alternateNames] = domainNames
+		const targetDomainName = [props.targetAlias, "astro-aws.org"]
+			.filter(Boolean)
+			.join(".")
 
 		const { certificate } = new CrossRegionCertificate(this, "Certificate", {
 			alternateNames,
@@ -55,23 +68,38 @@ export class RedirectStack extends Stack {
 			blockPublicAccess: BlockPublicAccess.BLOCK_ALL,
 			encryption: BucketEncryption.S3_MANAGED,
 			enforceSSL: true,
+			removalPolicy: RemovalPolicy.DESTROY,
 			versioned: true,
+			websiteRedirect: {
+				hostName: targetDomainName,
+				protocol: RedirectProtocol.HTTPS,
+			},
 		})
 
-		const distribution = new Distribution(this, "WWWRedirectDistribution", {
-			certificate,
-			defaultBehavior: {
-				functionAssociations: [
+		const distribution = new CloudFrontWebDistribution(
+			this,
+			"WWWRedirectDistribution",
+			{
+				defaultRootObject: "",
+				originConfigs: [
 					{
-						eventType: FunctionEventType.VIEWER_REQUEST,
-						function: wwwRedirectFunction,
+						behaviors: [{ isDefaultBehavior: true }],
+						customOriginSource: {
+							domainName: bucket.bucketWebsiteDomainName,
+							originProtocolPolicy: OriginProtocolPolicy.HTTP_ONLY,
+						},
 					},
 				],
-				origin: new S3Origin(bucket),
+				viewerCertificate: ViewerCertificate.fromAcmCertificate(certificate, {
+					aliases: domainNames,
+				}),
+				comment: `Redirect to ${targetDomainName} from ${domainNames.join(
+					", ",
+				)}`,
+				priceClass: PriceClass.PRICE_CLASS_ALL,
 				viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
 			},
-			domainNames,
-		})
+		)
 
 		const hostedZone = HostedZone.fromLookup(this, "HostedZone", {
 			domainName: hostedZoneName,

apps/infra/support/cross-region-certificate/index.mjs

@@ -2,7 +2,6 @@ import { randomUUID } from "node:crypto"
 
 import {
 	ACMClient,
-	DeleteCertificateCommand,
 	DescribeCertificateCommand,
 	RequestCertificateCommand,
 } from "@aws-sdk/client-acm"

apps/infra/support/redirect/index.js

@@ -9,7 +9,7 @@ function handler(event) {
 		statusDescription: "Temporary Redirect",
 		headers: {
 			location: {
-				value: "https://www.docs.astro-aws.org" + event.request.uri + qs,
+				value: "https://www.astro-aws.org" + event.request.uri + qs,
 			},
 		},
 	}