@openhi/constructs 0.0.117 → 0.0.118

package/lib/index.d.mts

@@ -343,6 +343,15 @@ declare abstract class OpenHiService extends Stack {
      * Short hash unique to the environment and branch combination.
      */
     readonly branchHash: string;
+    /**
+     * Branch hash computed against {@link defaultReleaseBranch} rather than
+     * {@link branchName}. On the release branch this equals {@link branchHash};
+     * on every other branch it identifies the namespace the release-branch
+     * deploy of this service writes to. Use when looking up SSM parameters
+     * that only the release-branch stack publishes (e.g. shared static-hosting
+     * bucket ARN).
+     */
+    readonly releaseBranchHash: string;
     /**
      * Short hash unique to the specific stack/service.
      */
@@ -1007,6 +1016,12 @@ declare class DiscoverableStringParameter extends StringParameter {
  * Props for the StaticContent construct.
  */
 interface StaticContentProps {
+    /**
+     * Destination bucket the content is uploaded to. Callers resolve this
+     * reference themselves so the construct doesn't need to know whether the
+     * bucket was created in the same stack or imported across branches.
+     */
+    readonly bucket: IBucket;
     /**
      * Absolute path to directory containing content for the website.
      */
@@ -1031,21 +1046,14 @@ interface StaticContentProps {
      * `<sub-domain>.<full-domain>`.
      */
     readonly fullDomain: string;
-    /**
-     * Service type used to look up the static-hosting bucket ARN via
-     * DiscoverableStringParameter.
-     *
-     * @default STATIC_HOSTING_SERVICE_TYPE ("website")
-     */
-    readonly serviceType?: string;
 }
 /**
- * Static content uploader: deploys a local directory to the static-hosting
+ * Static content uploader: deploys a local directory to a static-hosting
  * S3 bucket under `<sub-domain>.<full-domain>/<dest>` so each branch
- * deploys to its own prefix without clobbering siblings. The bucket ARN is
- * looked up via DiscoverableStringParameter so the uploader can run on a
- * feature-branch stack while the bucket itself was provisioned by the
- * release-branch service stack.
+ * deploys to its own prefix without clobbering siblings. The destination
+ * bucket is supplied by the caller, which lets the same construct run in
+ * both same-stack (release-branch) and cross-stack/cross-branch
+ * (feature-branch) contexts.
  */
 declare class StaticContent extends Construct {
     constructor(scope: Construct, id: string, props: StaticContentProps);
@@ -1956,6 +1964,17 @@ interface OpenHiWebsiteServiceProps extends OpenHiServiceProps {
      * @default - true on release branch, false otherwise
      */
     readonly createHostingInfrastructure?: boolean;
+    /**
+     * Whether to create the `StaticContent` uploader. Set to `false` to skip
+     * it entirely on every branch — used as a one-shot bootstrap toggle while
+     * the release-branch deploy of this service first creates the static-hosting
+     * bucket and writes `STATIC_HOSTING_BUCKET_ARN` to SSM. Once that
+     * parameter exists, flip back to `true` so feature-branch deploys can read
+     * it and upload content under their per-branch sub-domain folder.
+     *
+     * @default true
+     */
+    readonly createStaticContent?: boolean;
 }
 /**
  * SSM parameter name suffix for the website's full domain
@@ -2012,16 +2031,23 @@ declare class OpenHiWebsiteService extends OpenHiService {
      */
     readonly staticHosting?: StaticHosting;
     /**
-     * The content uploader, always created.
+     * The content uploader. Created on every deploy unless
+     * {@link OpenHiWebsiteServiceProps.createStaticContent} is `false`, in
+     * which case the property is `undefined` and the stack ships no
+     * `BucketDeployment`. Used during release-branch bootstrap, before the
+     * shared static-hosting bucket has been written to SSM for the first time.
      */
-    readonly staticContent: StaticContent;
+    readonly staticContent?: StaticContent;
     constructor(ohEnv: OpenHiEnvironment, props: OpenHiWebsiteServiceProps);
     /**
      * Validates that config required for the website stack is present.
      */
     protected validateConfig(props: OpenHiWebsiteServiceProps): void;
     /**
-     * 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.
      */
     protected createHostedZone(): IHostedZone;
@@ -2052,8 +2078,23 @@ declare 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}.
      */
     protected createStaticContent(): StaticContent;
+    /**
+     * 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}.
+     */
+    protected resolveStaticHostingBucket(): IBucket;
 }
 
 interface OwningDeleteCascadeLambdasProps {

package/lib/index.d.ts

@@ -980,6 +980,15 @@ declare abstract class OpenHiService extends Stack {
      * Short hash unique to the environment and branch combination.
      */
     readonly branchHash: string;
+    /**
+     * Branch hash computed against {@link defaultReleaseBranch} rather than
+     * {@link branchName}. On the release branch this equals {@link branchHash};
+     * on every other branch it identifies the namespace the release-branch
+     * deploy of this service writes to. Use when looking up SSM parameters
+     * that only the release-branch stack publishes (e.g. shared static-hosting
+     * bucket ARN).
+     */
+    readonly releaseBranchHash: string;
     /**
      * Short hash unique to the specific stack/service.
      */
@@ -1644,6 +1653,12 @@ declare class DiscoverableStringParameter extends StringParameter {
  * Props for the StaticContent construct.
  */
 interface StaticContentProps {
+    /**
+     * Destination bucket the content is uploaded to. Callers resolve this
+     * reference themselves so the construct doesn't need to know whether the
+     * bucket was created in the same stack or imported across branches.
+     */
+    readonly bucket: IBucket;
     /**
      * Absolute path to directory containing content for the website.
      */
@@ -1668,21 +1683,14 @@ interface StaticContentProps {
      * `<sub-domain>.<full-domain>`.
      */
     readonly fullDomain: string;
-    /**
-     * Service type used to look up the static-hosting bucket ARN via
-     * DiscoverableStringParameter.
-     *
-     * @default STATIC_HOSTING_SERVICE_TYPE ("website")
-     */
-    readonly serviceType?: string;
 }
 /**
- * Static content uploader: deploys a local directory to the static-hosting
+ * Static content uploader: deploys a local directory to a static-hosting
  * S3 bucket under `<sub-domain>.<full-domain>/<dest>` so each branch
- * deploys to its own prefix without clobbering siblings. The bucket ARN is
- * looked up via DiscoverableStringParameter so the uploader can run on a
- * feature-branch stack while the bucket itself was provisioned by the
- * release-branch service stack.
+ * deploys to its own prefix without clobbering siblings. The destination
+ * bucket is supplied by the caller, which lets the same construct run in
+ * both same-stack (release-branch) and cross-stack/cross-branch
+ * (feature-branch) contexts.
  */
 declare class StaticContent extends Construct {
     constructor(scope: Construct, id: string, props: StaticContentProps);
@@ -2593,6 +2601,17 @@ interface OpenHiWebsiteServiceProps extends OpenHiServiceProps {
      * @default - true on release branch, false otherwise
      */
     readonly createHostingInfrastructure?: boolean;
+    /**
+     * Whether to create the `StaticContent` uploader. Set to `false` to skip
+     * it entirely on every branch — used as a one-shot bootstrap toggle while
+     * the release-branch deploy of this service first creates the static-hosting
+     * bucket and writes `STATIC_HOSTING_BUCKET_ARN` to SSM. Once that
+     * parameter exists, flip back to `true` so feature-branch deploys can read
+     * it and upload content under their per-branch sub-domain folder.
+     *
+     * @default true
+     */
+    readonly createStaticContent?: boolean;
 }
 /**
  * SSM parameter name suffix for the website's full domain
@@ -2649,16 +2668,23 @@ declare class OpenHiWebsiteService extends OpenHiService {
      */
     readonly staticHosting?: StaticHosting;
     /**
-     * The content uploader, always created.
+     * The content uploader. Created on every deploy unless
+     * {@link OpenHiWebsiteServiceProps.createStaticContent} is `false`, in
+     * which case the property is `undefined` and the stack ships no
+     * `BucketDeployment`. Used during release-branch bootstrap, before the
+     * shared static-hosting bucket has been written to SSM for the first time.
      */
-    readonly staticContent: StaticContent;
+    readonly staticContent?: StaticContent;
     constructor(ohEnv: OpenHiEnvironment, props: OpenHiWebsiteServiceProps);
     /**
      * Validates that config required for the website stack is present.
      */
     protected validateConfig(props: OpenHiWebsiteServiceProps): void;
     /**
-     * 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.
      */
     protected createHostedZone(): IHostedZone;
@@ -2689,8 +2715,23 @@ declare 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}.
      */
     protected createStaticContent(): StaticContent;
+    /**
+     * 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}.
+     */
+    protected resolveStaticHostingBucket(): IBucket;
 }
 
 interface OwningDeleteCascadeLambdasProps {

package/lib/index.js

@@ -1127,6 +1127,16 @@ var OpenHiService = class extends import_aws_cdk_lib4.Stack {
       ),
       6
     );
+    const releaseBranchHash = (0, import_utils.hashString)(
+      [
+        appName,
+        ohEnv.deploymentTargetRole,
+        account,
+        region,
+        defaultReleaseBranch
+      ].join("-"),
+      6
+    );
     const stackHash = (0, import_utils.hashString)(
       [
         appName,
@@ -1157,6 +1167,7 @@ var OpenHiService = class extends import_aws_cdk_lib4.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}`,
@@ -2286,10 +2297,31 @@ var RootHostedZone = class extends import_constructs7.Construct {
 };
 
 // src/components/static-hosting/static-content.ts
-var import_aws_s32 = require("aws-cdk-lib/aws-s3");
 var import_aws_s3_deployment = require("aws-cdk-lib/aws-s3-deployment");
 var import_change_case2 = require("change-case");
-var import_constructs9 = require("constructs");
+var import_constructs8 = require("constructs");
+var StaticContent = class extends import_constructs8.Construct {
+  constructor(scope, id, props) {
+    super(scope, id);
+    const stack = OpenHiService.of(scope);
+    const {
+      bucket,
+      contentSourceDirectory,
+      contentDestinationDirectory = "/",
+      subDomain = stack.branchName,
+      fullDomain
+    } = props;
+    const keyPrefix = [(0, import_change_case2.paramCase)(subDomain), fullDomain].join(".");
+    const isTestEnv = process.env.JEST_WORKER_ID !== void 0;
+    const sources = isTestEnv ? [] : [import_aws_s3_deployment.Source.asset(contentSourceDirectory)];
+    new import_aws_s3_deployment.BucketDeployment(this, "deploy", {
+      sources,
+      destinationBucket: bucket,
+      retainOnDelete: false,
+      destinationKeyPrefix: `${keyPrefix}${contentDestinationDirectory}`
+    });
+  }
+};
 
 // src/components/static-hosting/static-hosting.ts
 var fs6 = __toESM(require("fs"));
@@ -2303,9 +2335,9 @@ var import_aws_logs = require("aws-cdk-lib/aws-logs");
 var import_aws_route532 = require("aws-cdk-lib/aws-route53");
 var import_aws_route53_targets = require("aws-cdk-lib/aws-route53-targets");
 var import_aws_s3 = require("aws-cdk-lib/aws-s3");
-var import_constructs8 = require("constructs");
+var import_constructs9 = require("constructs");
 var STATIC_HOSTING_SERVICE_TYPE = "website";
-var _StaticHosting = class _StaticHosting extends import_constructs8.Construct {
+var _StaticHosting = class _StaticHosting extends import_constructs9.Construct {
   constructor(scope, id, props = {}) {
     super(scope, id);
     const stack = OpenHiService.of(scope);
@@ -2441,35 +2473,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 import_constructs9.Construct {
-  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 = [(0, import_change_case2.paramCase)(subDomain), fullDomain].join(".");
-    const bucketArn = DiscoverableStringParameter.valueForLookupName(this, {
-      ssmParamName: StaticHosting.SSM_PARAM_NAME_BUCKET_ARN,
-      serviceType
-    });
-    const bucket = import_aws_s32.Bucket.fromBucketArn(this, "bucket", bucketArn);
-    const isTestEnv = process.env.JEST_WORKER_ID !== void 0;
-    const sources = isTestEnv ? [] : [import_aws_s3_deployment.Source.asset(contentSourceDirectory)];
-    new import_aws_s3_deployment.BucketDeployment(this, "deploy", {
-      sources,
-      destinationBucket: bucket,
-      retainOnDelete: false,
-      destinationKeyPrefix: `${keyPrefix}${contentDestinationDirectory}`
-    });
-  }
-};
-
 // src/services/open-hi-auth-service.ts
 var import_aws_cognito4 = require("aws-cdk-lib/aws-cognito");
 var import_aws_iam6 = require("aws-cdk-lib/aws-iam");
@@ -7180,6 +7183,7 @@ _OpenHiGraphqlService.SERVICE_TYPE = "graphql-api";
 var OpenHiGraphqlService = _OpenHiGraphqlService;
 
 // src/services/open-hi-website-service.ts
+var import_aws_s32 = require("aws-cdk-lib/aws-s3");
 var SSM_PARAM_NAME_FULL_DOMAIN = "WEBSITE_FULL_DOMAIN";
 var _OpenHiWebsiteService = class _OpenHiWebsiteService extends OpenHiService {
   /**
@@ -7250,7 +7254,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.
@@ -7263,14 +7269,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
     });
   }
   /**
@@ -7317,15 +7330,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 import_aws_s32.Bucket.fromBucketArn(this, "shared-bucket", bucketArn);
   }
 };
 _OpenHiWebsiteService.SERVICE_TYPE = "website";