@openhi/constructs 0.0.117 → 0.0.118

package/lib/index.mjs

@@ -386,6 +386,16 @@ var OpenHiService = class extends Stack {
       ),
       6
     );
+    const releaseBranchHash = hashString(
+      [
+        appName,
+        ohEnv.deploymentTargetRole,
+        account,
+        region,
+        defaultReleaseBranch
+      ].join("-"),
+      6
+    );
     const stackHash = hashString(
       [
         appName,
@@ -416,6 +426,7 @@ var OpenHiService = class extends Stack {
     this.branchName = branchName;
     this.environmentHash = environmentHash;
     this.branchHash = branchHash;
+    this.releaseBranchHash = releaseBranchHash;
     this.stackHash = stackHash;
     this.node.setContext(
       `availability-zones:account=${account}:region=${region}`,
@@ -1443,10 +1454,31 @@ var RootHostedZone = class extends Construct7 {
 };
 
 // src/components/static-hosting/static-content.ts
-import { Bucket as Bucket3 } from "aws-cdk-lib/aws-s3";
 import { BucketDeployment, Source } from "aws-cdk-lib/aws-s3-deployment";
 import { paramCase as paramCase2 } from "change-case";
-import { Construct as Construct9 } from "constructs";
+import { Construct as Construct8 } from "constructs";
+var StaticContent = class extends Construct8 {
+  constructor(scope, id, props) {
+    super(scope, id);
+    const stack = OpenHiService.of(scope);
+    const {
+      bucket,
+      contentSourceDirectory,
+      contentDestinationDirectory = "/",
+      subDomain = stack.branchName,
+      fullDomain
+    } = props;
+    const keyPrefix = [paramCase2(subDomain), fullDomain].join(".");
+    const isTestEnv = process.env.JEST_WORKER_ID !== void 0;
+    const sources = isTestEnv ? [] : [Source.asset(contentSourceDirectory)];
+    new BucketDeployment(this, "deploy", {
+      sources,
+      destinationBucket: bucket,
+      retainOnDelete: false,
+      destinationKeyPrefix: `${keyPrefix}${contentDestinationDirectory}`
+    });
+  }
+};
 
 // src/components/static-hosting/static-hosting.ts
 import * as fs6 from "fs";
@@ -1475,9 +1507,9 @@ import {
 } from "aws-cdk-lib/aws-route53";
 import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets";
 import { Bucket as Bucket2 } from "aws-cdk-lib/aws-s3";
-import { Construct as Construct8 } from "constructs";
+import { Construct as Construct9 } from "constructs";
 var STATIC_HOSTING_SERVICE_TYPE = "website";
-var _StaticHosting = class _StaticHosting extends Construct8 {
+var _StaticHosting = class _StaticHosting extends Construct9 {
   constructor(scope, id, props = {}) {
     super(scope, id);
     const stack = OpenHiService.of(scope);
@@ -1613,35 +1645,6 @@ _StaticHosting.SSM_PARAM_NAME_DISTRIBUTION_DOMAIN = "STATIC_HOSTING_DISTRIBUTION
 _StaticHosting.SSM_PARAM_NAME_DISTRIBUTION_ID = "STATIC_HOSTING_DISTRIBUTION_ID";
 var StaticHosting = _StaticHosting;
 
-// src/components/static-hosting/static-content.ts
-var StaticContent = class extends Construct9 {
-  constructor(scope, id, props) {
-    super(scope, id);
-    const stack = OpenHiService.of(scope);
-    const {
-      contentSourceDirectory,
-      contentDestinationDirectory = "/",
-      subDomain = stack.branchName,
-      fullDomain,
-      serviceType = STATIC_HOSTING_SERVICE_TYPE
-    } = props;
-    const keyPrefix = [paramCase2(subDomain), fullDomain].join(".");
-    const bucketArn = DiscoverableStringParameter.valueForLookupName(this, {
-      ssmParamName: StaticHosting.SSM_PARAM_NAME_BUCKET_ARN,
-      serviceType
-    });
-    const bucket = Bucket3.fromBucketArn(this, "bucket", bucketArn);
-    const isTestEnv = process.env.JEST_WORKER_ID !== void 0;
-    const sources = isTestEnv ? [] : [Source.asset(contentSourceDirectory)];
-    new BucketDeployment(this, "deploy", {
-      sources,
-      destinationBucket: bucket,
-      retainOnDelete: false,
-      destinationKeyPrefix: `${keyPrefix}${contentDestinationDirectory}`
-    });
-  }
-};
-
 // src/services/open-hi-auth-service.ts
 import {
   LambdaVersion,
@@ -2956,6 +2959,7 @@ _OpenHiGraphqlService.SERVICE_TYPE = "graphql-api";
 var OpenHiGraphqlService = _OpenHiGraphqlService;
 
 // src/services/open-hi-website-service.ts
+import { Bucket as Bucket3 } from "aws-cdk-lib/aws-s3";
 var SSM_PARAM_NAME_FULL_DOMAIN = "WEBSITE_FULL_DOMAIN";
 var _OpenHiWebsiteService = class _OpenHiWebsiteService extends OpenHiService {
   /**
@@ -3026,7 +3030,9 @@ var _OpenHiWebsiteService = class _OpenHiWebsiteService extends OpenHiService {
       });
       this.createFullDomainParameter();
     }
-    this.staticContent = this.createStaticContent();
+    if (props.createStaticContent !== false) {
+      this.staticContent = this.createStaticContent();
+    }
   }
   /**
    * Validates that config required for the website stack is present.
@@ -3039,14 +3045,21 @@ var _OpenHiWebsiteService = class _OpenHiWebsiteService extends OpenHiService {
     if (!config.zoneName) {
       throw new Error("Zone name is required");
     }
+    if (!config.hostedZoneId) {
+      throw new Error("Hosted zone ID is required to import the website zone");
+    }
   }
   /**
-   * Looks up the child hosted zone published by the Global service.
+   * Imports the website's hosted zone from config attributes (no SSM lookup).
+   * The website attaches DNS records here on the release-branch deploy and
+   * the same zone is imported on feature-branch deploys for any sub-domain
+   * routing.
    * Override to customize.
    */
   createHostedZone() {
-    return OpenHiGlobalService.childHostedZoneFromConstruct(this, {
-      zoneName: this.config.zoneName
+    return OpenHiGlobalService.rootHostedZoneFromConstruct(this, {
+      zoneName: this.config.zoneName,
+      hostedZoneId: this.config.hostedZoneId
     });
   }
   /**
@@ -3093,15 +3106,40 @@ var _OpenHiWebsiteService = class _OpenHiWebsiteService extends OpenHiService {
    * Creates the StaticContent uploader. Always created so feature-branch
    * deploys can publish content to their own sub-domain folder against the
    * release-branch bucket.
+   *
+   * The destination bucket is resolved here so the construct never has to
+   * branch on release-vs-feature: on the release branch we pass the
+   * just-created {@link staticHosting} bucket directly (no SSM round-trip
+   * within a single stack); on every other branch we look up the bucket
+   * ARN published by the release-branch deploy, addressed against
+   * {@link OpenHiService.releaseBranchHash}.
    */
   createStaticContent() {
     const { contentSourceDirectory, contentDestinationDirectory } = this.props;
     return new StaticContent(this, "static-content", {
+      bucket: this.resolveStaticHostingBucket(),
       contentSourceDirectory,
       contentDestinationDirectory,
-      fullDomain: this.fullDomain,
-      serviceType: _OpenHiWebsiteService.SERVICE_TYPE
+      fullDomain: this.fullDomain
+    });
+  }
+  /**
+   * Returns an {@link IBucket} pointing at the static-hosting bucket the
+   * uploader writes to. On the release-branch deploy this is the bucket
+   * just provisioned by {@link staticHosting}; on every other deploy it's
+   * imported from the bucket ARN the release-branch deploy publishes to
+   * SSM, addressed against {@link OpenHiService.releaseBranchHash}.
+   */
+  resolveStaticHostingBucket() {
+    if (this.staticHosting) {
+      return this.staticHosting.bucket;
+    }
+    const bucketArn = DiscoverableStringParameter.valueForLookupName(this, {
+      ssmParamName: StaticHosting.SSM_PARAM_NAME_BUCKET_ARN,
+      serviceType: _OpenHiWebsiteService.SERVICE_TYPE,
+      branchHash: this.releaseBranchHash
     });
+    return Bucket3.fromBucketArn(this, "shared-bucket", bucketArn);
   }
 };
 _OpenHiWebsiteService.SERVICE_TYPE = "website";