@sylvesterllc/aws-constructs 1.1.69 → 1.1.72

package/__tests__/SpaCFRoute53.test.ts

@@ -10,6 +10,7 @@ describe("SpaCFRoute53", () => {
     cloudfrontName: "testsite-cf",
     domainName: "example.com",
     fqdn: "spa.example.com",
+    hostedZoneId: "ZTEST1234567890",
   };
 
   it("provisions a private, versioned, encrypted S3 bucket with access logging", () => {

package/dist/constructs/SpaCFRoute53.js

@@ -9,7 +9,6 @@ const aws_certificatemanager_1 = require("aws-cdk-lib/aws-certificatemanager");
 const aws_route53_1 = require("aws-cdk-lib/aws-route53");
 const aws_route53_targets_1 = require("aws-cdk-lib/aws-route53-targets");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-const ulid_1 = require("../helpers/ulid");
 class SpaCFRoute53 extends constructs_1.Construct {
     bucket;
     distribution;
@@ -18,10 +17,10 @@ class SpaCFRoute53 extends constructs_1.Construct {
     logsBucket;
     constructor(scope, id, props) {
         super(scope, id);
-        // Generate a unique suffix for resource names
-        const uniqueId = (0, ulid_1.ulid)();
+        // Build a safe key from domain for export names (replace dots)
+        const domainKey = (props.fqdn ?? props.domainName).split(".").join("-");
         // Logs bucket with 14-day retention
-        this.logsBucket = new aws_s3_1.Bucket(this, `${props.domainName?.toLowerCase()}-spa-bucket-log-${uniqueId}`, {
+        this.logsBucket = new aws_s3_1.Bucket(this, `${props.domainName?.toLowerCase()}-spa-bucket-log`, {
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
             autoDeleteObjects: true,
             lifecycleRules: [{ expiration: aws_cdk_lib_1.Duration.days(14) }],
@@ -33,7 +32,7 @@ class SpaCFRoute53 extends constructs_1.Construct {
             accessControl: aws_s3_1.BucketAccessControl.LOG_DELIVERY_WRITE,
         });
         // Main SPA bucket
-        this.bucket = new aws_s3_1.Bucket(this, `${props.domainName?.toLowerCase()}-spa-bucket-${uniqueId}`, {
+        this.bucket = new aws_s3_1.Bucket(this, `${props.domainName?.toLowerCase()}-spa-bucket`, {
             bucketName: props.bucketName,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
             autoDeleteObjects: true,
@@ -46,33 +45,29 @@ class SpaCFRoute53 extends constructs_1.Construct {
         // Route53 hosted zone
         // Prefer direct import when a hostedZoneId is provided; use a dummy hosted zone for tests;
         // otherwise perform a lookup in the current account.
-        const hostedZone = props.domainName === "example.com"
+        const hostedZone = props.hostedZoneId
             ? aws_route53_1.HostedZone.fromHostedZoneAttributes(this, "HostedZone", {
-                hostedZoneId: "Z000000000000000TEST",
+                hostedZoneId: props.hostedZoneId,
                 zoneName: props.domainName,
             })
-            : props.hostedZoneId
-                ? aws_route53_1.HostedZone.fromHostedZoneAttributes(this, "HostedZone", {
-                    hostedZoneId: props.hostedZoneId,
-                    zoneName: props.domainName,
-                })
-                : aws_route53_1.HostedZone.fromLookup(this, "HostedZone", {
-                    domainName: props.domainName,
-                });
+            : aws_route53_1.HostedZone.fromLookup(this, "HostedZone", {
+                domainName: props.domainName,
+            });
         // ACM certificate (must be in us-east-1 for CloudFront)
         // Create a DNS-validated certificate in us-east-1 and tag it with a friendly name
-        const certificate = new aws_certificatemanager_1.DnsValidatedCertificate(this, "SpaCert", {
-            domainName: props.fqdn,
-            hostedZone,
-            region: "us-east-1",
-            subjectAlternativeNames: props.domainName && props.domainName !== props.fqdn ? [props.domainName] : undefined,
+        const certificate = new aws_certificatemanager_1.Certificate(this, "SpaCert", {
+            domainName: props.domainName,
+            subjectAlternativeNames: [
+                props.fqdn,
+            ],
+            validation: aws_certificatemanager_1.CertificateValidation.fromDns(hostedZone),
         });
         // Tag for visibility in console: "Certificate name"
         aws_cdk_lib_1.Tags.of(certificate).add("Name", `${props.siteName}-cert-cf`);
         // CloudFront distribution
         this.distribution = new aws_cloudfront_1.Distribution(this, "SpaDistribution", {
             defaultBehavior: {
-                origin: new aws_cloudfront_origins_1.S3Origin(this.bucket),
+                origin: aws_cloudfront_origins_1.S3BucketOrigin.withOriginAccessControl(this.bucket),
                 viewerProtocolPolicy: aws_cloudfront_1.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
                 allowedMethods: aws_cloudfront_1.AllowedMethods.ALLOW_GET_HEAD,
                 cachePolicy: undefined, // Custom cache policy can be added
@@ -119,7 +114,14 @@ class SpaCFRoute53 extends constructs_1.Construct {
         aws_cdk_lib_1.Tags.of(this.distribution).add("ResourcePrefix", props.siteName);
         aws_cdk_lib_1.Tags.of(this.logsBucket).add("App", props.siteName);
         aws_cdk_lib_1.Tags.of(this.logsBucket).add("ResourcePrefix", props.siteName);
+        // CloudFormation outputs for created resources
+        new aws_cdk_lib_1.CfnOutput(this, "SpaBucketName", { value: this.bucket.bucketName });
+        new aws_cdk_lib_1.CfnOutput(this, "SpaLogsBucketName", { value: this.logsBucket.bucketName });
+        new aws_cdk_lib_1.CfnOutput(this, "SpaCertificateArn", { value: certificate.certificateArn });
+        new aws_cdk_lib_1.CfnOutput(this, "SpaDistributionId", { value: this.distribution.distributionId });
+        new aws_cdk_lib_1.CfnOutput(this, "SpaDistributionDomainName", { value: this.distribution.distributionDomainName });
+        new aws_cdk_lib_1.CfnOutput(this, "SpaAliasRecordName", { value: props.fqdn });
     }
 }
 exports.SpaCFRoute53 = SpaCFRoute53;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SpaCFRoute53.js","sourceRoot":"","sources":["../../src/constructs/SpaCFRoute53.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport {\n  Bucket,\n  BlockPublicAccess,\n  BucketEncryption,\n  BucketAccessControl,\n  ObjectOwnership,\n} from \"aws-cdk-lib/aws-s3\";\nimport {\n  Distribution,\n  ViewerProtocolPolicy,\n  AllowedMethods,\n  PriceClass,\n  ResponseHeadersPolicy,\n  CfnDistribution,\n} from \"aws-cdk-lib/aws-cloudfront\";\nimport { S3Origin } from \"aws-cdk-lib/aws-cloudfront-origins\";\nimport { DnsValidatedCertificate, ICertificate } from \"aws-cdk-lib/aws-certificatemanager\";\nimport {\n  HostedZone,\n  IHostedZone,\n  ARecord,\n  RecordTarget,\n} from \"aws-cdk-lib/aws-route53\";\nimport { CloudFrontTarget } from \"aws-cdk-lib/aws-route53-targets\";\nimport { SpaProps } from \"../interfaces/SpaProps\";\nimport { Tags, RemovalPolicy, Duration } from \"aws-cdk-lib\";\nimport { ulid } from \"../helpers/ulid\";\n\nexport class SpaCFRoute53 extends Construct {\n  public readonly bucket: Bucket;\n  public readonly distribution: Distribution;\n  public readonly distributionDomainName: string;\n  public readonly distributionId: string;\n  public readonly logsBucket: Bucket;\n\n  constructor(scope: Construct, id: string, props: SpaProps) {\n    super(scope, id);\n\n    // Generate a unique suffix for resource names\n    const uniqueId = ulid();\n\n    // Logs bucket with 14-day retention\n    this.logsBucket = new Bucket(\n      this,\n      `${props.domainName?.toLowerCase()}-spa-bucket-log-${uniqueId}`,\n      {\n        removalPolicy: RemovalPolicy.DESTROY,\n        autoDeleteObjects: true,\n        lifecycleRules: [{ expiration: Duration.days(14) }],\n        blockPublicAccess: BlockPublicAccess.BLOCK_ALL,\n        encryption: BucketEncryption.S3_MANAGED,\n        versioned: false,\n        // CloudFront standard logs require ACLs; enable them and grant log delivery write\n        objectOwnership: ObjectOwnership.OBJECT_WRITER,\n        accessControl: BucketAccessControl.LOG_DELIVERY_WRITE,\n      },\n    );\n\n    // Main SPA bucket\n    this.bucket = new Bucket(\n      this,\n      `${props.domainName?.toLowerCase()}-spa-bucket-${uniqueId}`,\n      {\n        bucketName: props.bucketName,\n        removalPolicy: RemovalPolicy.DESTROY,\n        autoDeleteObjects: true,\n        blockPublicAccess: BlockPublicAccess.BLOCK_ALL,\n        encryption: BucketEncryption.S3_MANAGED,\n        versioned: true,\n        serverAccessLogsBucket: this.logsBucket,\n        serverAccessLogsPrefix: \"spa/\",\n      },\n    );\n\n    // Route53 hosted zone\n    // Prefer direct import when a hostedZoneId is provided; use a dummy hosted zone for tests;\n    // otherwise perform a lookup in the current account.\n    const hostedZone: IHostedZone =\n      props.domainName === \"example.com\"\n        ? HostedZone.fromHostedZoneAttributes(this, \"HostedZone\", {\n            hostedZoneId: \"Z000000000000000TEST\",\n            zoneName: props.domainName,\n          })\n        : props.hostedZoneId\n        ? HostedZone.fromHostedZoneAttributes(this, \"HostedZone\", {\n            hostedZoneId: props.hostedZoneId,\n            zoneName: props.domainName,\n          })\n        : HostedZone.fromLookup(this, \"HostedZone\", {\n            domainName: props.domainName,\n          });\n\n    // ACM certificate (must be in us-east-1 for CloudFront)\n    // Create a DNS-validated certificate in us-east-1 and tag it with a friendly name\n    const certificate: ICertificate = new DnsValidatedCertificate(this, \"SpaCert\", {\n      domainName: props.fqdn,\n      hostedZone,\n      region: \"us-east-1\",\n      subjectAlternativeNames: props.domainName && props.domainName !== props.fqdn ? [props.domainName] : undefined,\n    });\n    // Tag for visibility in console: \"Certificate name\"\n    Tags.of(certificate).add(\"Name\", `${props.siteName}-cert-cf`);\n\n    // CloudFront distribution\n    this.distribution = new Distribution(this, \"SpaDistribution\", {\n      defaultBehavior: {\n        origin: new S3Origin(this.bucket),\n        viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n        allowedMethods: AllowedMethods.ALLOW_GET_HEAD,\n        cachePolicy: undefined, // Custom cache policy can be added\n        compress: true,\n        responseHeadersPolicy:\n          ResponseHeadersPolicy.CORS_ALLOW_ALL_ORIGINS_WITH_PREFLIGHT_AND_SECURITY_HEADERS,\n      },\n      defaultRootObject: \"index.html\",\n      domainNames: [props.fqdn],\n      certificate,\n      priceClass: PriceClass.PRICE_CLASS_100,\n      enableLogging: true,\n      logBucket: this.logsBucket,\n      logFilePrefix: \"cloudfront/\",\n      errorResponses: [\n        {\n          httpStatus: 403,\n          responseHttpStatus: 200,\n          responsePagePath: \"/index.html\",\n          ttl: Duration.minutes(5),\n        },\n        {\n          httpStatus: 404,\n          responseHttpStatus: 200,\n          responsePagePath: \"/index.html\",\n          ttl: Duration.minutes(5),\n        },\n      ],\n    });\n\n    // Force TLS 1.3 in the synthesized template to satisfy tests\n    const cfnDist = this.distribution.node.defaultChild as CfnDistribution;\n    cfnDist.addPropertyOverride(\n      \"DistributionConfig.ViewerCertificate.MinimumProtocolVersion\",\n      \"TLSv1.3_2025\",\n    );\n\n    this.distributionDomainName = this.distribution.distributionDomainName;\n    this.distributionId = this.distribution.distributionId;\n\n    // Route53 alias record\n    new ARecord(this, \"SpaAliasRecord\", {\n      zone: hostedZone,\n      recordName: props.fqdn,\n      target: RecordTarget.fromAlias(new CloudFrontTarget(this.distribution)),\n    });\n\n    // Tagging\n    Tags.of(this.bucket).add(\"App\", props.siteName);\n    Tags.of(this.bucket).add(\"ResourcePrefix\", props.siteName);\n    Tags.of(this.distribution).add(\"App\", props.siteName);\n    Tags.of(this.distribution).add(\"ResourcePrefix\", props.siteName);\n    Tags.of(this.logsBucket).add(\"App\", props.siteName);\n    Tags.of(this.logsBucket).add(\"ResourcePrefix\", props.siteName);\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SpaCFRoute53.js","sourceRoot":"","sources":["../../src/constructs/SpaCFRoute53.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport {\n  Bucket,\n  BlockPublicAccess,\n  BucketEncryption,\n  BucketAccessControl,\n  ObjectOwnership,\n} from \"aws-cdk-lib/aws-s3\";\nimport {\n  Distribution,\n  ViewerProtocolPolicy,\n  AllowedMethods,\n  PriceClass,\n  ResponseHeadersPolicy,\n  CfnDistribution,\n} from \"aws-cdk-lib/aws-cloudfront\";\nimport { S3BucketOrigin } from \"aws-cdk-lib/aws-cloudfront-origins\";\nimport { Certificate, CertificateValidation, ICertificate } from \"aws-cdk-lib/aws-certificatemanager\";\nimport {\n  HostedZone,\n  IHostedZone,\n  ARecord,\n  RecordTarget,\n} from \"aws-cdk-lib/aws-route53\";\nimport { CloudFrontTarget } from \"aws-cdk-lib/aws-route53-targets\";\nimport { SpaProps } from \"../interfaces/SpaProps\";\nimport { Tags, RemovalPolicy, Duration, CfnOutput } from \"aws-cdk-lib\";\n\nexport class SpaCFRoute53 extends Construct {\n  public readonly bucket: Bucket;\n  public readonly distribution: Distribution;\n  public readonly distributionDomainName: string;\n  public readonly distributionId: string;\n  public readonly logsBucket: Bucket;\n\n  constructor(scope: Construct, id: string, props: SpaProps) {\n    super(scope, id);\n\n    // Build a safe key from domain for export names (replace dots)\n    const domainKey = (props.fqdn ?? props.domainName).split(\".\").join(\"-\");\n\n    // Logs bucket with 14-day retention\n    this.logsBucket = new Bucket(\n      this,\n      `${props.domainName?.toLowerCase()}-spa-bucket-log`,\n      {\n        removalPolicy: RemovalPolicy.DESTROY,\n        autoDeleteObjects: true,\n        lifecycleRules: [{ expiration: Duration.days(14) }],\n        blockPublicAccess: BlockPublicAccess.BLOCK_ALL,\n        encryption: BucketEncryption.S3_MANAGED,\n        versioned: false,\n        // CloudFront standard logs require ACLs; enable them and grant log delivery write\n        objectOwnership: ObjectOwnership.OBJECT_WRITER,\n        accessControl: BucketAccessControl.LOG_DELIVERY_WRITE,\n      },\n    );\n\n    // Main SPA bucket\n    this.bucket = new Bucket(\n      this,\n      `${props.domainName?.toLowerCase()}-spa-bucket`,\n      {\n        bucketName: props.bucketName,\n        removalPolicy: RemovalPolicy.DESTROY,\n        autoDeleteObjects: true,\n        blockPublicAccess: BlockPublicAccess.BLOCK_ALL,\n        encryption: BucketEncryption.S3_MANAGED,\n        versioned: true,\n        serverAccessLogsBucket: this.logsBucket,\n        serverAccessLogsPrefix: \"spa/\",\n      },\n    );\n\n    // Route53 hosted zone\n    // Prefer direct import when a hostedZoneId is provided; use a dummy hosted zone for tests;\n    // otherwise perform a lookup in the current account.\n    const hostedZone: IHostedZone =\n      props.hostedZoneId\n        ? HostedZone.fromHostedZoneAttributes(this, \"HostedZone\", {\n            hostedZoneId: props.hostedZoneId,\n            zoneName: props.domainName,\n          })\n        : HostedZone.fromLookup(this, \"HostedZone\", {\n            domainName: props.domainName,\n          });\n\n    // ACM certificate (must be in us-east-1 for CloudFront)\n    // Create a DNS-validated certificate in us-east-1 and tag it with a friendly name\n    const certificate: ICertificate = new Certificate(this, \"SpaCert\", {\n      domainName: props.domainName,\n      subjectAlternativeNames: [\n        props.fqdn,       \n      ],\n        validation: CertificateValidation.fromDns(hostedZone),\n    });\n    // Tag for visibility in console: \"Certificate name\"\n    Tags.of(certificate).add(\"Name\", `${props.siteName}-cert-cf`);\n\n    // CloudFront distribution\n    this.distribution = new Distribution(this, \"SpaDistribution\", {\n      defaultBehavior: {\n        origin: S3BucketOrigin.withOriginAccessControl(this.bucket),\n        viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n        allowedMethods: AllowedMethods.ALLOW_GET_HEAD,\n        cachePolicy: undefined, // Custom cache policy can be added\n        compress: true,\n        responseHeadersPolicy:\n          ResponseHeadersPolicy.CORS_ALLOW_ALL_ORIGINS_WITH_PREFLIGHT_AND_SECURITY_HEADERS,\n      },\n      defaultRootObject: \"index.html\",\n      domainNames: [props.fqdn],\n      certificate,\n      priceClass: PriceClass.PRICE_CLASS_100,\n      enableLogging: true,\n      logBucket: this.logsBucket,\n      logFilePrefix: \"cloudfront/\",\n      errorResponses: [\n        {\n          httpStatus: 403,\n          responseHttpStatus: 200,\n          responsePagePath: \"/index.html\",\n          ttl: Duration.minutes(5),\n        },\n        {\n          httpStatus: 404,\n          responseHttpStatus: 200,\n          responsePagePath: \"/index.html\",\n          ttl: Duration.minutes(5),\n        },\n      ],\n    });\n\n    // Force TLS 1.3 in the synthesized template to satisfy tests\n    const cfnDist = this.distribution.node.defaultChild as CfnDistribution;\n    cfnDist.addPropertyOverride(\n      \"DistributionConfig.ViewerCertificate.MinimumProtocolVersion\",\n      \"TLSv1.3_2025\",\n    );\n\n    this.distributionDomainName = this.distribution.distributionDomainName;\n    this.distributionId = this.distribution.distributionId;\n\n    // Route53 alias record\n    new ARecord(this, \"SpaAliasRecord\", {\n      zone: hostedZone,\n      recordName: props.fqdn,\n      target: RecordTarget.fromAlias(new CloudFrontTarget(this.distribution)),\n    });\n\n    // Tagging\n    Tags.of(this.bucket).add(\"App\", props.siteName);\n    Tags.of(this.bucket).add(\"ResourcePrefix\", props.siteName);\n    Tags.of(this.distribution).add(\"App\", props.siteName);\n    Tags.of(this.distribution).add(\"ResourcePrefix\", props.siteName);\n    Tags.of(this.logsBucket).add(\"App\", props.siteName);\n    Tags.of(this.logsBucket).add(\"ResourcePrefix\", props.siteName);\n\n    // CloudFormation outputs for created resources\n    new CfnOutput(this, \"SpaBucketName\", { value: this.bucket.bucketName });\n    new CfnOutput(this, \"SpaLogsBucketName\", { value: this.logsBucket.bucketName });\n    new CfnOutput(this, \"SpaCertificateArn\", { value: certificate.certificateArn });\n    new CfnOutput(this, \"SpaDistributionId\", { value: this.distribution.distributionId });\n    new CfnOutput(this, \"SpaDistributionDomainName\", { value: this.distribution.distributionDomainName });\n    new CfnOutput(this, \"SpaAliasRecordName\", { value: props.fqdn });\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sylvesterllc/aws-constructs",
-  "version": "1.1.69",
+  "version": "1.1.72",
   "description": "AWS Constructs",
   "main": "dist/index.js",
   "keywords": [
@@ -11,7 +11,7 @@
     "build": "npm run clean && tsc",
     "build:layers": "cd ./src/resources/layers/common && pnpm i && tsc",
     "watch": "tsc -w",
-    "test": "bun test",
+    "test": "jest --passWithNoTests",
     "cdk": "cdk",
     "clean": "rm -rf dist",
     "clean:install": "npm run clean:nm && npm i",

package/src/constructs/SpaCFRoute53.ts

@@ -14,8 +14,8 @@ import {
   ResponseHeadersPolicy,
   CfnDistribution,
 } from "aws-cdk-lib/aws-cloudfront";
-import { S3Origin } from "aws-cdk-lib/aws-cloudfront-origins";
-import { DnsValidatedCertificate, ICertificate } from "aws-cdk-lib/aws-certificatemanager";
+import { S3BucketOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
+import { Certificate, CertificateValidation, ICertificate } from "aws-cdk-lib/aws-certificatemanager";
 import {
   HostedZone,
   IHostedZone,
@@ -24,8 +24,7 @@ import {
 } from "aws-cdk-lib/aws-route53";
 import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets";
 import { SpaProps } from "../interfaces/SpaProps";
-import { Tags, RemovalPolicy, Duration } from "aws-cdk-lib";
-import { ulid } from "../helpers/ulid";
+import { Tags, RemovalPolicy, Duration, CfnOutput } from "aws-cdk-lib";
 
 export class SpaCFRoute53 extends Construct {
   public readonly bucket: Bucket;
@@ -37,13 +36,13 @@ export class SpaCFRoute53 extends Construct {
   constructor(scope: Construct, id: string, props: SpaProps) {
     super(scope, id);
 
-    // Generate a unique suffix for resource names
-    const uniqueId = ulid();
+    // Build a safe key from domain for export names (replace dots)
+    const domainKey = (props.fqdn ?? props.domainName).split(".").join("-");
 
     // Logs bucket with 14-day retention
     this.logsBucket = new Bucket(
       this,
-      `${props.domainName?.toLowerCase()}-spa-bucket-log-${uniqueId}`,
+      `${props.domainName?.toLowerCase()}-spa-bucket-log`,
       {
         removalPolicy: RemovalPolicy.DESTROY,
         autoDeleteObjects: true,
@@ -60,7 +59,7 @@ export class SpaCFRoute53 extends Construct {
     // Main SPA bucket
     this.bucket = new Bucket(
       this,
-      `${props.domainName?.toLowerCase()}-spa-bucket-${uniqueId}`,
+      `${props.domainName?.toLowerCase()}-spa-bucket`,
       {
         bucketName: props.bucketName,
         removalPolicy: RemovalPolicy.DESTROY,
@@ -77,12 +76,7 @@ export class SpaCFRoute53 extends Construct {
     // Prefer direct import when a hostedZoneId is provided; use a dummy hosted zone for tests;
     // otherwise perform a lookup in the current account.
     const hostedZone: IHostedZone =
-      props.domainName === "example.com"
-        ? HostedZone.fromHostedZoneAttributes(this, "HostedZone", {
-            hostedZoneId: "Z000000000000000TEST",
-            zoneName: props.domainName,
-          })
-        : props.hostedZoneId
+      props.hostedZoneId
         ? HostedZone.fromHostedZoneAttributes(this, "HostedZone", {
             hostedZoneId: props.hostedZoneId,
             zoneName: props.domainName,
@@ -93,11 +87,12 @@ export class SpaCFRoute53 extends Construct {
 
     // ACM certificate (must be in us-east-1 for CloudFront)
     // Create a DNS-validated certificate in us-east-1 and tag it with a friendly name
-    const certificate: ICertificate = new DnsValidatedCertificate(this, "SpaCert", {
-      domainName: props.fqdn,
-      hostedZone,
-      region: "us-east-1",
-      subjectAlternativeNames: props.domainName && props.domainName !== props.fqdn ? [props.domainName] : undefined,
+    const certificate: ICertificate = new Certificate(this, "SpaCert", {
+      domainName: props.domainName,
+      subjectAlternativeNames: [
+        props.fqdn,       
+      ],
+        validation: CertificateValidation.fromDns(hostedZone),
     });
     // Tag for visibility in console: "Certificate name"
     Tags.of(certificate).add("Name", `${props.siteName}-cert-cf`);
@@ -105,7 +100,7 @@ export class SpaCFRoute53 extends Construct {
     // CloudFront distribution
     this.distribution = new Distribution(this, "SpaDistribution", {
       defaultBehavior: {
-        origin: new S3Origin(this.bucket),
+        origin: S3BucketOrigin.withOriginAccessControl(this.bucket),
         viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
         allowedMethods: AllowedMethods.ALLOW_GET_HEAD,
         cachePolicy: undefined, // Custom cache policy can be added
@@ -160,5 +155,13 @@ export class SpaCFRoute53 extends Construct {
     Tags.of(this.distribution).add("ResourcePrefix", props.siteName);
     Tags.of(this.logsBucket).add("App", props.siteName);
     Tags.of(this.logsBucket).add("ResourcePrefix", props.siteName);
+
+    // CloudFormation outputs for created resources
+    new CfnOutput(this, "SpaBucketName", { value: this.bucket.bucketName });
+    new CfnOutput(this, "SpaLogsBucketName", { value: this.logsBucket.bucketName });
+    new CfnOutput(this, "SpaCertificateArn", { value: certificate.certificateArn });
+    new CfnOutput(this, "SpaDistributionId", { value: this.distribution.distributionId });
+    new CfnOutput(this, "SpaDistributionDomainName", { value: this.distribution.distributionDomainName });
+    new CfnOutput(this, "SpaAliasRecordName", { value: props.fqdn });
   }
 }