Behaviour Prefixes (for CDK v2 upgrade) (#1401)

* Added options for behaviour prefixes au nz etc

* Added options for behaviour prefixes au nz etc

* Fix: Rename behaviourPrefixes prop

* Allow override of whole behaviourOptions, edited a comment

* spread behaviouroverride props

* removed excess edge lambda line

packages/prerender-proxy/lib/prerender-lambda-construct.ts

@@ -34,25 +34,25 @@ export class PrerenderLambda extends Construct {
 
     this.prerenderCheckFunction = new PrerenderCheckFunction(
       this,
-      "PrerenderViewerRequest",
+      `${id}-PrerenderViewerRequest`,
       props.prerenderCheckOptions
     );
 
     this.prerenderFunction = new PrerenderFunction(
       this,
-      "PrerenderOriginRequest",
+      `${id}-PrerenderOriginRequest`,
       props.prerenderProps
     );
 
     this.errorResponseFunction = new ErrorResponseFunction(
       this,
-      "ErrorResponse",
+      `${id}-ErrorResponse`,
       props.errorResponseProps
     );
 
     this.cacheControlFunction = new CloudFrontCacheControl(
       this,
-      "PrerenderCloudFrontCacheControl",
+      `${id}-PrerenderCloudFrontCacheControl`,
       props.cacheControlProps
     );
   }

packages/static-hosting/index.ts

@@ -1,4 +1,8 @@
-import { StaticHosting, StaticHostingProps } from "./lib/static-hosting";
+import {
+  StaticHosting,
+  StaticHostingProps,
+  remapPath,
+} from "./lib/static-hosting";
 import { CSP } from "./types/csp";
 
-export { StaticHosting, StaticHostingProps, CSP };
+export { StaticHosting, StaticHostingProps, CSP, remapPath };

packages/static-hosting/lib/static-hosting.ts

@@ -139,6 +139,16 @@ export interface StaticHostingProps {
    */
   enableStaticFileRemap?: boolean;
 
+  /**
+   * Overrides default behaviour paths with a prefix and takes in behviour options to apply on the prefix behaviour
+   *
+   * @default true
+   */
+  defaultBehaviourPrefixes?: {
+    prefix: string;
+    behaviourOverride: Partial<BehaviorOptions>;
+  }[];
+
   /**
    * Optional additional properties for static file remap behaviours
    *
@@ -292,7 +302,7 @@ export interface StaticHostingProps {
   comment?: string;
 }
 
-interface remapPath {
+export interface remapPath {
   from: string;
   to?: string;
   behaviour?: Partial<BehaviorOptions>;
@@ -537,16 +547,6 @@ export class StaticHosting extends Construct {
       }
     }
 
-    if (enableStaticFileRemap) {
-      for (const path of this.staticFiles) {
-        additionalBehaviors[`*.${path}`] = {
-          origin: s3Origin,
-          viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-          ...props.staticFileRemapOptions,
-        };
-      }
-    }
-
     // Note: A given path may override if the same path is defined both remapPaths and remapBackendPaths. This is an
     // unlikely scenario but worth noting. e.g. `/robots.txt` should be defined in one of the above but not both.
     if (props.remapPaths) {
@@ -560,6 +560,31 @@ export class StaticHosting extends Construct {
       }
     }
 
+    if (enableStaticFileRemap) {
+      const staticFileRemapPrefixes = props.defaultBehaviourPrefixes?.map(
+        prefix => `${prefix.prefix}/`
+      ) || [""];
+      staticFileRemapPrefixes.forEach(prefix => {
+        this.staticFiles.forEach(path => {
+          additionalBehaviors[`${prefix}*.${path}`] = {
+            origin: s3Origin,
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+          };
+        });
+      });
+    }
+
+    props.defaultBehaviourPrefixes?.forEach(prefix => {
+      additionalBehaviors[`${prefix.prefix}*`] = {
+        origin: s3Origin,
+        viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+        originRequestPolicy: originRequestPolicy,
+        cachePolicy: originCachePolicy,
+        responseHeadersPolicy: responseHeadersPolicy,
+        ...prefix.behaviourOverride,
+      };
+    });
+
     if (props.responseHeadersPolicies?.defaultBehaviorResponseHeaderPolicy) {
       defaultBehavior.responseHeadersPolicy =
         props.responseHeadersPolicies.defaultBehaviorResponseHeaderPolicy;