fix(pulumi-aws): add support for website redirects

Author: Pavel910

packages/pulumi-aws/src/apps/tenantRouter.ts

@@ -5,32 +5,58 @@ import { PulumiApp, PulumiAppResource } from "@webiny/pulumi";
 import { CoreOutput } from "./common";
 import { LAMBDA_RUNTIME } from "~/constants";
 import { getEnvVariableAwsRegion } from "~/env/awsRegion";
+import type { WebsiteRedirect } from "~/apps/website/index.js";
 
 interface Params {
     region: string;
     dynamoDbTable: string;
+    redirects: WebsiteRedirect[];
 }
 
-function createFunctionArchive({ dynamoDbTable, region }: Params) {
+const PERMANENT_CACHE = 31536000;
+const TEMPORARY_CACHE = 86400;
+
+function createFunctionArchive({ dynamoDbTable, region, redirects }: Params) {
     const handler = readFileSync(
         __dirname + "/../components/tenantRouter/functions/origin/request.js",
         "utf-8"
     );
 
+    const matchRedirect = readFileSync(
+        __dirname + "/../components/tenantRouter/functions/origin/matchRedirect.js",
+        "utf-8"
+    );
+
+    const redirectsMap = redirects.reduce((acc, redirect) => {
+        const maxAge = redirect.permanent ? PERMANENT_CACHE : TEMPORARY_CACHE;
+
+        return {
+            ...acc,
+            [redirect.from]: {
+                to: redirect.to,
+                permanent: redirect.permanent,
+                maxAge: redirect.maxAge ?? maxAge
+            }
+        };
+    }, {});
+
     const source = handler
         .replace("{DB_TABLE_NAME}", dynamoDbTable)
         .replace("{DB_TABLE_REGION}", region);
 
     return new pulumi.asset.AssetArchive({
-        "index.js": new pulumi.asset.StringAsset(source)
+        "index.js": new pulumi.asset.StringAsset(source),
+        "matchRedirect.js": new pulumi.asset.StringAsset(matchRedirect),
+        "redirects.json": new pulumi.asset.StringAsset(JSON.stringify(redirectsMap))
     });
 }
 
 const PREFIX = "website-router";
 
 export function applyTenantRouter(
     app: PulumiApp,
-    cloudfront: PulumiAppResource<typeof aws.cloudfront.Distribution>
+    cloudfront: PulumiAppResource<typeof aws.cloudfront.Distribution>,
+    redirects: WebsiteRedirect[]
 ) {
     const region = getEnvVariableAwsRegion();
 
@@ -100,7 +126,8 @@ export function applyTenantRouter(
             code: dynamoDbTable.apply(dynamoDbTable => {
                 return createFunctionArchive({
                     region,
-                    dynamoDbTable
+                    dynamoDbTable,
+                    redirects
                 });
             })
         },

packages/pulumi-aws/src/apps/website/createWebsitePulumiApp.ts

@@ -16,6 +16,18 @@ import { getEnvVariableWebinyProjectName } from "~/env/projectName";
 
 export type WebsitePulumiApp = ReturnType<typeof createWebsitePulumiApp>;
 
+export type WebsiteRedirect = {
+    from: string;
+    to: string;
+    permanent: boolean;
+    /**
+     * Cache duration in seconds.
+     * For permanent redirects, the default value is 1 year (31536000 seconds).
+     * For temporary redirects, the default value is 1 day (86400 seconds).
+     */
+    maxAge?: number;
+};
+
 export interface CreateWebsitePulumiAppParams {
     /**
      * Custom domain(s) configuration.
@@ -39,6 +51,11 @@ export interface CreateWebsitePulumiAppParams {
      */
     pulumi?: (app: WebsitePulumiApp) => void | Promise<void>;
 
+    /**
+     * Define redirects to be handled by website Lambda@Edge function.
+     */
+    redirects?: () => Promise<WebsiteRedirect[]> | WebsiteRedirect[];
+
     /**
      * Prefixes names of all Pulumi cloud infrastructure resource with given prefix.
      */
@@ -271,7 +288,11 @@ export const createWebsitePulumiApp = (projectAppParams: CreateWebsitePulumiAppP
                 process.env.WCP_PROJECT_ENVIRONMENT ||
                 process.env.WEBINY_MULTI_TENANCY === "true"
             ) {
-                const { originLambda } = applyTenantRouter(app, deliveryCloudfront);
+                const redirects = projectAppParams.redirects
+                    ? await projectAppParams.redirects()
+                    : [];
+
+                const { originLambda } = applyTenantRouter(app, deliveryCloudfront, redirects);
 
                 app.addHandler(() => {
                     app.addOutputs({

packages/pulumi-aws/src/components/tenantRouter/WebsiteTenantRouter.ts

@@ -0,0 +1,54 @@
+exports.matchRedirect = (request, redirects) => {
+    const headers = request.headers;
+
+    // Build the full URL from the request
+    const protocol = headers["cloudfront-forwarded-proto"]
+        ? headers["cloudfront-forwarded-proto"][0].value
+        : "https";
+    const hostname = headers.host[0].value;
+    const uri = request.uri.replace("/index.html", "");
+    const querystring = request.querystring ? `?${request.querystring}` : "";
+
+    const fullUrl = `${protocol}://${hostname}${uri}${querystring}`;
+    const fullUrlNoQuery = `${protocol}://${hostname}${uri}`;
+
+    // Try to find a match (priority: with query > without query > path only)
+    let redirectConfig = redirects[fullUrl] || redirects[fullUrlNoQuery] || redirects[uri];
+
+    // If no match found, return null
+    if (!redirectConfig) {
+        return null;
+    }
+
+    // Return a function that generates the redirect response
+    return () => {
+        // Build redirect URL
+        let redirectTo = redirectConfig.to;
+
+        // If redirect.to is a path (not full URL), prepend current domain
+        if (!redirectTo.startsWith("http://") && !redirectTo.startsWith("https://")) {
+            redirectTo = `${protocol}://${hostname}${redirectTo}`;
+        }
+
+        console.log("REDIRECTING!", redirectTo);
+
+        return {
+            status: redirectConfig.permanent ? "301" : "302",
+            statusDescription: redirectConfig.permanent ? "Moved Permanently" : "Found",
+            headers: {
+                location: [
+                    {
+                        key: "Location",
+                        value: redirectTo
+                    }
+                ],
+                "cache-control": [
+                    {
+                        key: "Cache-Control",
+                        value: "max-age=" + redirectConfig.maxAge
+                    }
+                ]
+            }
+        };
+    };
+};

packages/pulumi-aws/src/components/tenantRouter/functions/origin/matchRedirect.js

@@ -1,5 +1,7 @@
 const { DynamoDBClient } = require("@aws-sdk/client-dynamodb");
 const { DynamoDBDocument, QueryCommand, GetCommand } = require("@aws-sdk/lib-dynamodb");
+const redirects = require("./redirects.json");
+const { matchRedirect } = require("./matchRedirect.js");
 
 // Since Lambda@Edge doesn't support ENV variables, the easiest way to pass
 // config values to it is to inject them into the source code before deploy.
@@ -83,6 +85,11 @@ async function handleOriginRequest(request) {
     const requestedDomain = request.headers.host[0].value;
     const originDomain = isCustomOrigin ? origin.custom.domainName : origin.s3.domainName;
 
+    const redirect = matchRedirect(request, redirects);
+    if (redirect) {
+        return redirect();
+    }
+
     let tenant;
     if (await hasMultipleTenants()) {
         // Find tenant by domain. This record is stored to the DB using the Tenant Manager app.

packages/pulumi-aws/src/components/tenantRouter/functions/origin/request.js

@@ -1,4 +1,3 @@
-export { WebsiteTenantRouter } from "./components/tenantRouter/WebsiteTenantRouter";
 export * from "./apps";
 export * from "./utils";
 export * from "./constants";

packages/pulumi-aws/src/index.ts

@@ -16,7 +16,7 @@ export interface CreateWebsiteAppParams extends CreateWebsitePulumiAppParams {
     plugins?: PluginCollection;
 }
 
-interface CreateWebsiteAppResult {
+export interface CreateWebsiteAppResult {
     id: string;
     name: string;
     description: string;