@fjall/components-infrastructure 0.89.5 → 0.89.6

package/dist/lib/patterns/aws/account.js

@@ -1,44 +1,53 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Account = void 0;
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const aws_1 = require("../../config/aws");
-const cloudTrail_1 = require("../../config/aws/cloudTrail");
-const oidcConnector_1 = require("../../config/aws/oidcConnector");
-const accountMonitoringRole_1 = require("../../config/aws/accountMonitoringRole");
-const accountAuditRole_1 = require("../../config/aws/accountAuditRole");
-const getConfig_1 = require("../../utils/getConfig");
-const disasterRecovery_1 = require("../../config/aws/disasterRecovery");
-class Account extends aws_cdk_lib_1.Stack {
+import { CfnOutput, Stack } from "aws-cdk-lib";
+import { EcrDefaultImage, DefaultEventBus, SharedAlarmTopic } from "../../config/aws/index.js";
+import { ManagementEventsTrail } from "../../config/aws/cloudTrail.js";
+import { OidcConnector } from "../../config/aws/oidcConnector.js";
+import { AccountMonitoringRole } from "../../config/aws/accountMonitoringRole.js";
+import { AccountAuditRole } from "../../config/aws/accountAuditRole.js";
+import { getConfig } from "../../utils/getConfig.js";
+import { DisasterRecovery } from "../../config/aws/disasterRecovery.js";
+import { S3BlockPublicAccess } from "../../config/aws/s3BlockPublicAccess.js";
+import { EbsDefaultEncryption } from "../../config/aws/ebsDefaultEncryption.js";
+import { ConfigRulePreset } from "../../config/aws/configRulePreset.js";
+import { GuardDutyDetector } from "../../config/aws/guardDutyDetector.js";
+import { SecurityHubHub } from "../../config/aws/securityHubHub.js";
+import { ConfigRecorder } from "../../config/aws/configRecorder.js";
+import { AccountAccessAnalyser } from "../../config/aws/accessAnalyser.js";
+import { InspectorEnablement } from "../../config/aws/inspectorEnablement.js";
+export class Account extends Stack {
+    organisationType = "account";
+    resolvedRegion;
     constructor(scope, id, props) {
-        const config = (0, getConfig_1.getConfig)();
+        const config = getConfig();
         const accountId = props.accountId ?? config.accountId;
         const region = props.region ?? config.region;
         if (!accountId) {
             throw new Error("Account requires an account ID. Provide it via accountId or ensure CDK context includes accountId.");
         }
-        super(scope, id, props);
-        this.organisationType = "account";
-        this.resolvedRegion = region;
+        const env = props.env ?? { region, account: accountId };
+        super(scope, id, { ...props, env });
+        this.resolvedRegion = region ?? this.region;
         const orgId = this.node.tryGetContext("orgId");
         if (orgId) {
-            new aws_cdk_lib_1.CfnOutput(this, "OrganisationIdOutput", {
+            new CfnOutput(this, "OrganisationIdOutput", {
                 key: "OrganisationId",
                 value: orgId,
                 exportName: "OrganisationId"
             });
         }
-        new aws_cdk_lib_1.CfnOutput(this, "AccountIdOutput", {
+        new CfnOutput(this, "AccountIdOutput", {
             key: "AccountId",
             value: this.account,
             exportName: "AccountId",
             description: "AWS Account ID for this account"
         });
-        const eventBus = new aws_1.DefaultEventBus(this, "EventBus");
+        const eventBus = new DefaultEventBus(this, "EventBus");
+        new SharedAlarmTopic(this, "AlarmTopic");
+        const isStandaloneAccount = this.constructor === Account;
         const ipamPoolId = this.node.tryGetContext("ipamPoolId");
-        if (id === "Account" && ipamPoolId) {
-            const regionSuffix = region.replace(/-/g, "");
-            new aws_cdk_lib_1.CfnOutput(this, "IpamPoolIdOutput", {
+        if (isStandaloneAccount && ipamPoolId && this.resolvedRegion) {
+            const regionSuffix = this.resolvedRegion.replace(/-/g, "");
+            new CfnOutput(this, "IpamPoolIdOutput", {
                 key: `IpamPoolId${accountId}${regionSuffix}`,
                 value: ipamPoolId,
                 exportName: `IpamPoolId${accountId}${regionSuffix}`
@@ -46,41 +55,59 @@ class Account extends aws_cdk_lib_1.Stack {
         }
         const fjallOrgId = this.node.tryGetContext("fjallOrgId");
         const oidcAlreadyConfigured = this.node.tryGetContext("fjallOidcConfigured") === "true";
-        if (id === "Account" && fjallOrgId && !oidcAlreadyConfigured) {
-            new oidcConnector_1.OidcConnector(this, "OidcConnector", { fjallOrgId });
+        if (isStandaloneAccount && fjallOrgId && !oidcAlreadyConfigured) {
+            new OidcConnector(this, "OidcConnector", { fjallOrgId });
         }
         // Per-account monitoring role (unconditional; ExternalId added when orgId known)
-        new accountMonitoringRole_1.AccountMonitoringRole(this, "MonitoringRole", fjallOrgId ? { fjallOrgId } : undefined);
+        new AccountMonitoringRole(this, "MonitoringRole", fjallOrgId ? { fjallOrgId } : undefined);
         // Per-account audit role (conditional on fjallOrgId)
         if (fjallOrgId) {
-            new accountAuditRole_1.AccountAuditRole(this, "AuditRole", { fjallOrgId });
+            new AccountAuditRole(this, "AuditRole", { fjallOrgId });
         }
-        new cloudTrail_1.ManagementEventsTrail(this, "CloudTrail", {
+        new ManagementEventsTrail(this, "CloudTrail", {
             accountId: this.account,
             region
         });
-        new aws_1.EcrDefaultImage(this, "EcrDefaultImage", {
+        new EcrDefaultImage(this, "EcrDefaultImage", {
             region,
             accountId: this.account,
             eventBusArn: eventBus.defaultEventBusArn.value
         });
-        const environment = config.environment || "unknown";
+        const environment = config.environment ?? "unknown";
         if (config.disasterRecoveryRegion) {
             const isComplianceAccount = environment === "compliance";
             if (environment === "production" || isComplianceAccount) {
-                new disasterRecovery_1.DisasterRecovery(this, "DisasterRecovery", {
+                new DisasterRecovery(this, "DisasterRecovery", {
                     region,
                     accountId
                 });
             }
         }
-        new aws_cdk_lib_1.CfnOutput(this, "Environment", {
+        new CfnOutput(this, "Environment", {
             key: "Environment",
             value: environment,
             exportName: "Environment",
             description: "Environment type for this account (e.g., production, staging, development)"
         });
+        new S3BlockPublicAccess(this, "S3BlockPublicAccess");
+        new EbsDefaultEncryption(this, "EbsDefaultEncryption");
+    }
+    enableGuardDuty(props) {
+        return new GuardDutyDetector(this, "GuardDuty", props);
+    }
+    enableSecurityHub(props) {
+        return new SecurityHubHub(this, "SecurityHub", props);
+    }
+    enableConfigRecorder(props) {
+        return new ConfigRecorder(this, "ConfigRecorder", props);
+    }
+    enableAccessAnalyser() {
+        return new AccountAccessAnalyser(this, "AccessAnalyser");
+    }
+    enableInspector() {
+        return new InspectorEnablement(this, "Inspector");
+    }
+    enableConfigRules(props) {
+        return new ConfigRulePreset(this, "ConfigRules", props);
     }
 }
-exports.Account = Account;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/account.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Stack, type StackProps } from \"aws-cdk-lib\";\nimport { EcrDefaultImage, DefaultEventBus } from \"../../config/aws\";\nimport { type Construct } from \"constructs\";\nimport { ManagementEventsTrail } from \"../../config/aws/cloudTrail\";\nimport { OidcConnector } from \"../../config/aws/oidcConnector\";\nimport { AccountMonitoringRole } from \"../../config/aws/accountMonitoringRole\";\nimport { AccountAuditRole } from \"../../config/aws/accountAuditRole\";\nimport { getConfig } from \"../../utils/getConfig\";\nimport { DisasterRecovery } from \"../../config/aws/disasterRecovery\";\nimport type { OrganisationType } from \"./interfaces/organisation\";\n\nexport interface AccountProps extends StackProps {\n  accountId?: string;\n  region?: string;\n}\n\nexport class Account extends Stack {\n  public readonly organisationType: OrganisationType = \"account\";\n  protected readonly resolvedRegion: string;\n\n  constructor(scope: Construct, id: string, props: AccountProps) {\n    const config = getConfig();\n    const accountId = props.accountId ?? config.accountId;\n    const region = props.region ?? config.region;\n\n    if (!accountId) {\n      throw new Error(\n        \"Account requires an account ID. Provide it via accountId or ensure CDK context includes accountId.\"\n      );\n    }\n\n    super(scope, id, props);\n\n    this.resolvedRegion = region;\n\n    const orgId = this.node.tryGetContext(\"orgId\");\n    if (orgId) {\n      new CfnOutput(this, \"OrganisationIdOutput\", {\n        key: \"OrganisationId\",\n        value: orgId,\n        exportName: \"OrganisationId\"\n      });\n    }\n\n    new CfnOutput(this, \"AccountIdOutput\", {\n      key: \"AccountId\",\n      value: this.account,\n      exportName: \"AccountId\",\n      description: \"AWS Account ID for this account\"\n    });\n\n    const eventBus = new DefaultEventBus(this, \"EventBus\");\n\n    const ipamPoolId = this.node.tryGetContext(\"ipamPoolId\");\n    if (id === \"Account\" && ipamPoolId) {\n      const regionSuffix = region.replace(/-/g, \"\");\n      new CfnOutput(this, \"IpamPoolIdOutput\", {\n        key: `IpamPoolId${accountId}${regionSuffix}`,\n        value: ipamPoolId,\n        exportName: `IpamPoolId${accountId}${regionSuffix}`\n      });\n    }\n\n    const fjallOrgId = this.node.tryGetContext(\"fjallOrgId\");\n    const oidcAlreadyConfigured =\n      this.node.tryGetContext(\"fjallOidcConfigured\") === \"true\";\n    if (id === \"Account\" && fjallOrgId && !oidcAlreadyConfigured) {\n      new OidcConnector(this, \"OidcConnector\", { fjallOrgId });\n    }\n\n    // Per-account monitoring role (unconditional; ExternalId added when orgId known)\n    new AccountMonitoringRole(\n      this,\n      \"MonitoringRole\",\n      fjallOrgId ? { fjallOrgId } : undefined\n    );\n\n    // Per-account audit role (conditional on fjallOrgId)\n    if (fjallOrgId) {\n      new AccountAuditRole(this, \"AuditRole\", { fjallOrgId });\n    }\n\n    new ManagementEventsTrail(this, \"CloudTrail\", {\n      accountId: this.account,\n      region\n    });\n\n    new EcrDefaultImage(this, \"EcrDefaultImage\", {\n      region,\n      accountId: this.account,\n      eventBusArn: eventBus.defaultEventBusArn.value\n    });\n\n    const environment = config.environment || \"unknown\";\n\n    if (config.disasterRecoveryRegion) {\n      const isComplianceAccount = environment === \"compliance\";\n\n      if (environment === \"production\" || isComplianceAccount) {\n        new DisasterRecovery(this, \"DisasterRecovery\", {\n          region,\n          accountId\n        });\n      }\n    }\n\n    new CfnOutput(this, \"Environment\", {\n      key: \"Environment\",\n      value: environment,\n      exportName: \"Environment\",\n      description:\n        \"Environment type for this account (e.g., production, staging, development)\"\n    });\n  }\n}\n"]}

package/dist/lib/patterns/aws/apexDomainPattern.d.ts

@@ -0,0 +1,26 @@
+import type { Construct } from "constructs";
+import type { IHostedZone } from "aws-cdk-lib/aws-route53";
+import type { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
+import type { ManualRecord, Route53ApexProps, SubdomainDelegation } from "./interfaces/domain.js";
+export interface ApexDomainPatternResult {
+    readonly hostedZone: IHostedZone;
+    readonly certificates: Map<string, ICertificate>;
+    readonly nameServers: string[] | undefined;
+    readonly manualRecords: ManualRecord[];
+    readonly delegations: SubdomainDelegation[];
+}
+/**
+ * Composition for `registrar: "route53"`. Creates (or imports) the apex
+ * `HostedZone`, wires child-account delegations via `NsRecord` (pointing at
+ * each child's nameservers published as exports), and composes all user
+ * records + certificates.
+ *
+ * Delegation mechanism: the child Fjall account scaffolds its own
+ * `HostedZone`, and the parent simply writes NS records pointing at the
+ * child's nameservers (Fn.importValue of the child stack's nameservers
+ * output). This differs from the legacy `DomainDelegation` pattern, which
+ * uses `CrossAccountZoneDelegationRecord` to create the child HZ from the
+ * parent via IAM assume-role. Both patterns are valid for their respective
+ * semantics — see R10 in the Phase 1 plan.
+ */
+export declare function composeApexDomain(scope: Construct, props: Route53ApexProps): ApexDomainPatternResult;

package/dist/lib/patterns/aws/apexDomainPattern.js

@@ -0,0 +1,91 @@
+import { Fn } from "aws-cdk-lib";
+import { getDomainExportNames } from "@fjall/util";
+import { HostedZone } from "../../resources/aws/networking/hostedZone.js";
+import { DomainCertificate } from "../../resources/aws/networking/domainCertificate.js";
+import { NsRecord } from "../../resources/aws/networking/dnsRecord/index.js";
+import { composeTypedDnsRecords } from "./dnsRecordComposer.js";
+import { toPascalCase, getSafeZoneName } from "../../utils/capitaliseString.js";
+/**
+ * Composition for `registrar: "route53"`. Creates (or imports) the apex
+ * `HostedZone`, wires child-account delegations via `NsRecord` (pointing at
+ * each child's nameservers published as exports), and composes all user
+ * records + certificates.
+ *
+ * Delegation mechanism: the child Fjall account scaffolds its own
+ * `HostedZone`, and the parent simply writes NS records pointing at the
+ * child's nameservers (Fn.importValue of the child stack's nameservers
+ * output). This differs from the legacy `DomainDelegation` pattern, which
+ * uses `CrossAccountZoneDelegationRecord` to create the child HZ from the
+ * parent via IAM assume-role. Both patterns are valid for their respective
+ * semantics — see R10 in the Phase 1 plan.
+ */
+export function composeApexDomain(scope, props) {
+    const safeZone = toPascalCase(getSafeZoneName(props.zoneName));
+    const hostedZoneConstruct = new HostedZone(scope, `${safeZone}HostedZone`, {
+        zoneName: props.zoneName,
+        hostedZoneId: props.hostedZoneId,
+        // Only create the delegation role on the create path; imported zones do
+        // not manage IAM themselves.
+        createDelegationRole: props.hostedZoneId === undefined,
+        costAllocationEnvironment: props.costAllocationEnvironment,
+        costAllocationDomain: props.zoneName
+    });
+    const certificates = new Map();
+    (props.certificates ?? []).forEach((cert, index) => {
+        const normalised = normaliseCertificate(cert);
+        const safeCertName = toPascalCase(normalised.domainName.split(".").join(""));
+        const dc = new DomainCertificate(scope, `${safeZone}${safeCertName}Cert${index}`, {
+            domainName: normalised.domainName,
+            subjectAlternativeNames: normalised.subjectAlternativeNames,
+            transparencyLogging: normalised.transparencyLogging,
+            hostedZone: hostedZoneConstruct.hostedZone,
+            costAllocationEnvironment: props.costAllocationEnvironment,
+            costAllocationDomain: props.zoneName
+        });
+        certificates.set(normalised.domainName, dc.certificate);
+    });
+    if (props.records && props.records.length > 0) {
+        composeTypedDnsRecords(scope, hostedZoneConstruct.hostedZone, props.zoneName, props.records);
+    }
+    const delegations = props.delegations ?? [];
+    delegations.forEach((delegation, index) => {
+        const childZoneName = `${delegation.subdomain}.${props.zoneName}`;
+        const safeChild = toPascalCase(getSafeZoneName(childZoneName));
+        const childExports = getDomainExportNames(childZoneName);
+        // The child account's stack publishes the hosted-zone nameservers under a
+        // predictable output key (Phase 0 HostedZone emits `{safeZone}Nameservers`
+        // as a joined comma-separated string — we split it back at deploy time
+        // via Fn.split). The child HZ id import is declared as a cross-phase
+        // dependency — if the child stack has not deployed, CFN fails at deploy.
+        const nameserversExportName = childExports.hostedZoneId.replace(/-hosted-zone-id$/, "-nameservers");
+        const nameserversToken = Fn.importValue(nameserversExportName);
+        new NsRecord(scope, `${safeZone}Delegation${safeChild}${index}`, {
+            zone: hostedZoneConstruct.hostedZone,
+            zoneName: props.zoneName,
+            recordName: delegation.subdomain,
+            // Fn.split returns a list token suitable for a multi-value NS record.
+            values: Fn.split(",", nameserversToken)
+        });
+    });
+    return {
+        hostedZone: hostedZoneConstruct.hostedZone,
+        certificates,
+        // Name servers are only available on the create path — imported zones
+        // were pre-provisioned and CDK has no view of their NS set at synth.
+        nameServers: hostedZoneConstruct.isImported
+            ? undefined
+            : (hostedZoneConstruct.nameServers ?? undefined),
+        manualRecords: [],
+        delegations
+    };
+}
+function normaliseCertificate(cert) {
+    if (typeof cert === "string") {
+        return { domainName: cert };
+    }
+    return {
+        domainName: cert.domainName,
+        subjectAlternativeNames: cert.subjectAlternativeNames,
+        transparencyLogging: cert.transparencyLogging
+    };
+}

package/dist/lib/patterns/aws/auditRole.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuditRole = void 0;
-const constructs_1 = require("constructs");
-const app_1 = require("../../app");
-const auditRole_1 = require("../../resources/aws/audit/auditRole");
-const audit_1 = require("../../config/audit");
+import { Construct } from "constructs";
+import App from "../../app.js";
+import AuditRoleFactory from "../../resources/aws/audit/auditRole.js";
+import { FJALL_AUDIT_CONFIG } from "../../config/audit.js";
 /**
  * High-level pattern for adding CloudQuery audit capabilities to an application.
  *
@@ -24,21 +21,23 @@ const audit_1 = require("../../config/audit");
  * app.addCompute(/* ... *\/);
  * ```
  */
-class AuditRole extends constructs_1.Construct {
+export class AuditRole extends Construct {
+    role;
+    externalId;
     constructor(scope, id, props) {
         super(scope, id);
         // Get the App instance to access the network stack
-        const app = scope instanceof app_1.default ? scope : app_1.default.getInstance();
+        const app = scope instanceof App ? scope : App.getInstance();
         const networkStack = app.getDefaultNetworkStack();
         // Generate or use provided external ID
         this.externalId = props?.externalId || this.generateExternalId(app);
         // Create the audit role using the factory
-        this.role = auditRole_1.default.build(`${app["name"]}AuditRole`, {
-            webappAccountId: props?.webappAccountId || audit_1.FJALL_AUDIT_CONFIG.webappAwsAccountId,
+        this.role = AuditRoleFactory.build(`${app["name"]}AuditRole`, {
+            webappAccountId: props?.webappAccountId || FJALL_AUDIT_CONFIG.webappAwsAccountId,
             appName: app["name"],
             externalId: this.externalId,
-            roleNamePrefix: audit_1.FJALL_AUDIT_CONFIG.roleNamePrefix,
-            rolePath: audit_1.FJALL_AUDIT_CONFIG.rolePath
+            roleNamePrefix: FJALL_AUDIT_CONFIG.roleNamePrefix,
+            rolePath: FJALL_AUDIT_CONFIG.rolePath
         })(app, networkStack.getStack());
         // Register the role with the network stack
         networkStack.addConstruct(this.role);
@@ -53,6 +52,4 @@ class AuditRole extends constructs_1.Construct {
         return `fjall-audit-${appName.toLowerCase()}-${timestamp}`;
     }
 }
-exports.AuditRole = AuditRole;
-exports.default = AuditRole;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXVkaXRSb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vbGliL3BhdHRlcm5zL2F3cy9hdWRpdFJvbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBRXZDLG1DQUE0QjtBQUM1QixtRUFBbUU7QUFDbkUsOENBQXdEO0FBZ0J4RDs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBa0JHO0FBQ0gsTUFBYSxTQUFVLFNBQVEsc0JBQVM7SUFJdEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFzQjtRQUM5RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLG1EQUFtRDtRQUNuRCxNQUFNLEdBQUcsR0FBRyxLQUFLLFlBQVksYUFBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLGFBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUM3RCxNQUFNLFlBQVksR0FBRyxHQUFHLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztRQUVsRCx1Q0FBdUM7UUFDdkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLEVBQUUsVUFBVSxJQUFJLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUVwRSwwQ0FBMEM7UUFDMUMsSUFBSSxDQUFDLElBQUksR0FBRyxtQkFBZ0IsQ0FBQyxLQUFLLENBQUMsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRTtZQUM1RCxlQUFlLEVBQ2IsS0FBSyxFQUFFLGVBQWUsSUFBSSwwQkFBa0IsQ0FBQyxrQkFBa0I7WUFDakUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUM7WUFDcEIsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVO1lBQzNCLGNBQWMsRUFBRSwwQkFBa0IsQ0FBQyxjQUFjO1lBQ2pELFFBQVEsRUFBRSwwQkFBa0IsQ0FBQyxRQUFRO1NBQ3RDLENBQUMsQ0FBQyxHQUFHLEVBQUUsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFFakMsMkNBQTJDO1FBQzNDLFlBQVksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFFRDs7O09BR0c7SUFDSyxrQkFBa0IsQ0FBQyxHQUFRO1FBQ2pDLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM1QixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDN0IsT0FBTyxlQUFlLE9BQU8sQ0FBQyxXQUFXLEVBQUUsSUFBSSxTQUFTLEVBQUUsQ0FBQztJQUM3RCxDQUFDO0NBQ0Y7QUFyQ0QsOEJBcUNDO0FBRUQsa0JBQWUsU0FBUyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IHR5cGUgUm9sZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtaWFtXCI7XG5pbXBvcnQgQXBwIGZyb20gXCIuLi8uLi9hcHBcIjtcbmltcG9ydCBBdWRpdFJvbGVGYWN0b3J5IGZyb20gXCIuLi8uLi9yZXNvdXJjZXMvYXdzL2F1ZGl0L2F1ZGl0Um9sZVwiO1xuaW1wb3J0IHsgRkpBTExfQVVESVRfQ09ORklHIH0gZnJvbSBcIi4uLy4uL2NvbmZpZy9hdWRpdFwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEF1ZGl0Um9sZVByb3BzIHtcbiAgLyoqXG4gICAqIE92ZXJyaWRlIHRoZSBkZWZhdWx0IEZqYWxsIHdlYmFwcCBhY2NvdW50IElEXG4gICAqIERlZmF1bHRzIHRvIHRoZSBhY2NvdW50IElEIHNwZWNpZmllZCBpbiBGSkFMTF9BVURJVF9DT05GSUdcbiAgICovXG4gIHdlYmFwcEFjY291bnRJZD86IHN0cmluZztcblxuICAvKipcbiAgICogRXh0ZXJuYWwgSUQgZm9yIGFkZGl0aW9uYWwgc2VjdXJpdHkgd2hlbiBhc3N1bWluZyB0aGUgcm9sZVxuICAgKiBJZiBub3QgcHJvdmlkZWQsIGEgdW5pcXVlIGV4dGVybmFsIElEIHdpbGwgYmUgZ2VuZXJhdGVkXG4gICAqL1xuICBleHRlcm5hbElkPzogc3RyaW5nO1xufVxuXG4vKipcbiAqIEhpZ2gtbGV2ZWwgcGF0dGVybiBmb3IgYWRkaW5nIENsb3VkUXVlcnkgYXVkaXQgY2FwYWJpbGl0aWVzIHRvIGFuIGFwcGxpY2F0aW9uLlxuICpcbiAqIFRoaXMgY3JlYXRlcyBhIGNyb3NzLWFjY291bnQgSUFNIHJvbGUgdGhhdCBncmFudHMgdGhlIEZqYWxsIHBsYXRmb3JtIHJlYWQtb25seVxuICogYWNjZXNzIHRvIGFsbCBBV1MgcmVzb3VyY2VzIGZvciBzZWN1cml0eSBhdWRpdGluZyB2aWEgQ2xvdWRRdWVyeS5cbiAqXG4gKiBAZXhhbXBsZVxuICogYGBgdHlwZXNjcmlwdFxuICogaW1wb3J0IHsgQXBwLCBBdWRpdFJvbGUgfSBmcm9tIFwiQGZqYWxsL2NvbXBvbmVudHMtaW5mcmFzdHJ1Y3R1cmVcIjtcbiAqXG4gKiBjb25zdCBhcHAgPSBBcHAuZ2V0QXBwKFwiTXlBcHBcIik7XG4gKlxuICogLy8gRXhwbGljaXQgb3B0LWluIHRvIGF1ZGl0IGNhcGFiaWxpdGllc1xuICogY29uc3QgYXVkaXRSb2xlID0gbmV3IEF1ZGl0Um9sZShhcHAsIFwiQXVkaXRSb2xlXCIpO1xuICpcbiAqIC8vIENvbnRpbnVlIHdpdGggbm9ybWFsIGFwcGxpY2F0aW9uIHNldHVwXG4gKiBhcHAuYWRkQ29tcHV0ZSgvKiAuLi4gKlxcLyk7XG4gKiBgYGBcbiAqL1xuZXhwb3J0IGNsYXNzIEF1ZGl0Um9sZSBleHRlbmRzIENvbnN0cnVjdCB7XG4gIHB1YmxpYyByZWFkb25seSByb2xlOiBSb2xlO1xuICBwdWJsaWMgcmVhZG9ubHkgZXh0ZXJuYWxJZDogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzPzogQXVkaXRSb2xlUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuXG4gICAgLy8gR2V0IHRoZSBBcHAgaW5zdGFuY2UgdG8gYWNjZXNzIHRoZSBuZXR3b3JrIHN0YWNrXG4gICAgY29uc3QgYXBwID0gc2NvcGUgaW5zdGFuY2VvZiBBcHAgPyBzY29wZSA6IEFwcC5nZXRJbnN0YW5jZSgpO1xuICAgIGNvbnN0IG5ldHdvcmtTdGFjayA9IGFwcC5nZXREZWZhdWx0TmV0d29ya1N0YWNrKCk7XG5cbiAgICAvLyBHZW5lcmF0ZSBvciB1c2UgcHJvdmlkZWQgZXh0ZXJuYWwgSURcbiAgICB0aGlzLmV4dGVybmFsSWQgPSBwcm9wcz8uZXh0ZXJuYWxJZCB8fCB0aGlzLmdlbmVyYXRlRXh0ZXJuYWxJZChhcHApO1xuXG4gICAgLy8gQ3JlYXRlIHRoZSBhdWRpdCByb2xlIHVzaW5nIHRoZSBmYWN0b3J5XG4gICAgdGhpcy5yb2xlID0gQXVkaXRSb2xlRmFjdG9yeS5idWlsZChgJHthcHBbXCJuYW1lXCJdfUF1ZGl0Um9sZWAsIHtcbiAgICAgIHdlYmFwcEFjY291bnRJZDpcbiAgICAgICAgcHJvcHM/LndlYmFwcEFjY291bnRJZCB8fCBGSkFMTF9BVURJVF9DT05GSUcud2ViYXBwQXdzQWNjb3VudElkLFxuICAgICAgYXBwTmFtZTogYXBwW1wibmFtZVwiXSxcbiAgICAgIGV4dGVybmFsSWQ6IHRoaXMuZXh0ZXJuYWxJZCxcbiAgICAgIHJvbGVOYW1lUHJlZml4OiBGSkFMTF9BVURJVF9DT05GSUcucm9sZU5hbWVQcmVmaXgsXG4gICAgICByb2xlUGF0aDogRkpBTExfQVVESVRfQ09ORklHLnJvbGVQYXRoXG4gICAgfSkoYXBwLCBuZXR3b3JrU3RhY2suZ2V0U3RhY2soKSk7XG5cbiAgICAvLyBSZWdpc3RlciB0aGUgcm9sZSB3aXRoIHRoZSBuZXR3b3JrIHN0YWNrXG4gICAgbmV0d29ya1N0YWNrLmFkZENvbnN0cnVjdCh0aGlzLnJvbGUpO1xuICB9XG5cbiAgLyoqXG4gICAqIEdlbmVyYXRlIGEgdW5pcXVlIGV4dGVybmFsIElEIGZvciB0aGlzIGFwcGxpY2F0aW9uXG4gICAqIEZvcm1hdDogZmphbGwtYXVkaXQte2FwcE5hbWV9LXt0aW1lc3RhbXB9XG4gICAqL1xuICBwcml2YXRlIGdlbmVyYXRlRXh0ZXJuYWxJZChhcHA6IEFwcCk6IHN0cmluZyB7XG4gICAgY29uc3QgYXBwTmFtZSA9IGFwcFtcIm5hbWVcIl07XG4gICAgY29uc3QgdGltZXN0YW1wID0gRGF0ZS5ub3coKTtcbiAgICByZXR1cm4gYGZqYWxsLWF1ZGl0LSR7YXBwTmFtZS50b0xvd2VyQ2FzZSgpfS0ke3RpbWVzdGFtcH1gO1xuICB9XG59XG5cbmV4cG9ydCBkZWZhdWx0IEF1ZGl0Um9sZTtcbiJdfQ==
+export default AuditRole;

package/dist/lib/patterns/aws/buildkite.d.ts

@@ -1,7 +1,7 @@
 import { type StackProps, Stack } from "aws-cdk-lib";
 import { InstanceType } from "aws-cdk-lib/aws-ec2";
 import { type Construct } from "constructs";
-import { type KeyValue } from "../../types";
+import { type KeyValue } from "../../types.js";
 declare enum agentRelease {
     STABLE = "stable",
     BETA = "beta",