@fjall/components-infrastructure 2.30.0 → 2.30.3

package/dist/lib/config/aws/organisation.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const constructs_1 = require("constructs");
+const stripAndCamelCase_1 = require("../../utils/stripAndCamelCase");
+const cdk_organizations_1 = require("@pepperize/cdk-organizations");
+const addSuffixToEmail_1 = require("../../utils/addSuffixToEmail");
+/**
+ * A construct for creating multi environment organisations with a production, staging and development account.
+ */
+class Organisation extends constructs_1.Construct {
+    constructor(scope, id, props) {
+        super(scope, id);
+        this.accounts = {};
+        this.organisationalUnits = [];
+        this.existingAccounts = props.existingAccounts;
+        this.addOrganisation(props.organisationName);
+        this.addOrganisationUnitsAndAccounts(props.accounts, props.orgEmail);
+    }
+    addOrganisation(organisationName) {
+        this.organisation = new cdk_organizations_1.Organization(this, organisationName, {
+            featureSet: cdk_organizations_1.FeatureSet.ALL
+        });
+        // TODO: Validate this enables trusted access
+        this.organisation.enableAwsServiceAccess("account.amazonaws.com");
+        const enforcedPolicyTypes = [
+            cdk_organizations_1.PolicyType.SERVICE_CONTROL_POLICY,
+            cdk_organizations_1.PolicyType.TAG_POLICY,
+            cdk_organizations_1.PolicyType.BACKUP_POLICY,
+            cdk_organizations_1.PolicyType.AISERVICES_OPT_OUT_POLICY
+        ];
+        for (const policyType of enforcedPolicyTypes) {
+            this.organisation.enablePolicyType(policyType);
+        }
+    }
+    addOrganisationUnitsAndAccounts(accounts, orgEmail) {
+        for (const [environmentType, accountList] of Object.entries(accounts)) {
+            // Create OU for each environment type
+            const ouName = environmentType.charAt(0).toUpperCase() + environmentType.slice(1);
+            const orgUnit = this.addOrganisationalUnit(`${ouName}OrganizationalUnit`, ouName);
+            // Convert single account to array for uniform processing
+            const accountsArray = Array.isArray(accountList)
+                ? accountList
+                : [accountList];
+            // Add accounts to this OU
+            for (const accountName of accountsArray) {
+                const accountNameId = (0, stripAndCamelCase_1.stripAndCamelCase)(accountName);
+                const importedAccount = this.existingAccounts?.find((account) => account.Name === accountName);
+                const accountEmail = importedAccount
+                    ? importedAccount.Email
+                    : (0, addSuffixToEmail_1.default)(orgEmail, accountNameId.toLowerCase());
+                if (accountEmail) {
+                    this.addAccount(`${accountNameId}Account`, accountName, accountEmail, { env: environmentType }, orgUnit);
+                }
+            }
+        }
+    }
+    addOrganisationalUnit(id, name) {
+        const ou = new cdk_organizations_1.OrganizationalUnit(this, id, {
+            organizationalUnitName: name,
+            parent: this.organisation.root,
+            importOnDuplicate: true
+        });
+        this.organisationalUnits.push(ou);
+        return ou;
+    }
+    addAccount(id, name, email, tags, organisationalUnit) {
+        const acc = new cdk_organizations_1.Account(this, id, {
+            accountName: name,
+            email: email,
+            parent: organisationalUnit,
+            importOnDuplicate: true
+        });
+        for (const tag in tags) {
+            aws_cdk_lib_1.Tags.of(acc).add(tag, tags[tag]);
+        }
+        this.accounts[name] = acc.accountId;
+        new aws_cdk_lib_1.CfnOutput(this, `${id}Id`, {
+            key: `${id}Id`,
+            value: acc.accountId,
+            exportName: `${id}Id`
+        });
+        new aws_cdk_lib_1.CfnOutput(this, `${id}Arn`, {
+            key: `${id}Arn`,
+            value: acc.accountArn,
+            exportName: `${id}Arn`
+        });
+        return acc;
+    }
+    getAccounts() {
+        return this.accounts;
+    }
+}
+exports.default = Organisation;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"organisation.js","sourceRoot":"","sources":["../../../../lib/config/aws/organisation.ts"],"names":[],"mappings":";;AAAA,6CAA+D;AAC/D,2CAAuC;AACvC,qEAAkE;AAElE,oEAMsC;AACtC,mEAA4D;AAc5D;;GAEG;AAEH,MAAqB,YAAa,SAAQ,sBAAS;IAQjD,YAAY,KAAgB,EAAE,EAAU,EAAE,KAAwB;QAChE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QALX,aAAQ,GAAa,EAAE,CAAC;QAExB,wBAAmB,GAAyB,EAAE,CAAC;QAKrD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC7C,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvE,CAAC;IAEO,eAAe,CAAC,gBAAwB;QAC9C,IAAI,CAAC,YAAY,GAAG,IAAI,gCAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE;YAC3D,UAAU,EAAE,8BAAU,CAAC,GAAG;SAC3B,CAAC,CAAC;QAEH,6CAA6C;QAC7C,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,CAAC;QAElE,MAAM,mBAAmB,GAAiB;YACxC,8BAAU,CAAC,sBAAsB;YACjC,8BAAU,CAAC,UAAU;YACrB,8BAAU,CAAC,aAAa;YACxB,8BAAU,CAAC,yBAAyB;SACrC,CAAC;QAEF,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;YAC7C,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAEO,+BAA+B,CACrC,QAAwB,EACxB,QAAgB;QAEhB,KAAK,MAAM,CAAC,eAAe,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtE,sCAAsC;YACtC,MAAM,MAAM,GACV,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrE,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CACxC,GAAG,MAAM,oBAAoB,EAC7B,MAAM,CACP,CAAC;YAEF,yDAAyD;YACzD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;gBAC9C,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAElB,0BAA0B;YAC1B,KAAK,MAAM,WAAW,IAAI,aAAa,EAAE,CAAC;gBACxC,MAAM,aAAa,GAAG,IAAA,qCAAiB,EAAC,WAAW,CAAC,CAAC;gBAErD,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,CACjD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAC1C,CAAC;gBACF,MAAM,YAAY,GAAG,eAAe;oBAClC,CAAC,CAAC,eAAe,CAAC,KAAK;oBACvB,CAAC,CAAC,IAAA,0BAAgB,EAAC,QAAQ,EAAE,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;gBAE5D,IAAI,YAAY,EAAE,CAAC;oBACjB,IAAI,CAAC,UAAU,CACb,GAAG,aAAa,SAAS,EACzB,WAAW,EACX,YAAY,EACZ,EAAE,GAAG,EAAE,eAAe,EAAE,EACxB,OAAO,CACR,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,EAAU,EAAE,IAAY;QACpD,MAAM,EAAE,GAAG,IAAI,sCAAkB,CAAC,IAAI,EAAE,EAAE,EAAE;YAC1C,sBAAsB,EAAE,IAAI;YAC5B,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;YAC9B,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClC,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,UAAU,CAChB,EAAU,EACV,IAAY,EACZ,KAAa,EACb,IAA+B,EAC/B,kBAAsC;QAEtC,MAAM,GAAG,GAAG,IAAI,2BAAO,CAAC,IAAI,EAAE,EAAE,EAAE;YAChC,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,kBAAkB;YAC1B,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QAEH,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,kBAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC;QAEpC,IAAI,uBAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;YAC7B,GAAG,EAAE,GAAG,EAAE,IAAI;YACd,KAAK,EAAE,GAAG,CAAC,SAAS;YACpB,UAAU,EAAE,GAAG,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,IAAI,uBAAS,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE;YAC9B,GAAG,EAAE,GAAG,EAAE,KAAK;YACf,KAAK,EAAE,GAAG,CAAC,UAAU;YACrB,UAAU,EAAE,GAAG,EAAE,KAAK;SACvB,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AA9HD,+BA8HC","sourcesContent":["import { CfnOutput, Tags, type StackProps } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { stripAndCamelCase } from \"../../utils/stripAndCamelCase\";\nimport { type Account as ExistingAccounts } from \"@aws-sdk/client-organizations\";\nimport {\n  Account,\n  FeatureSet,\n  Organization,\n  OrganizationalUnit,\n  PolicyType\n} from \"@pepperize/cdk-organizations\";\nimport addSuffixToEmail from \"../../utils/addSuffixToEmail\";\nimport { type KeyValue } from \"../../types\";\n\ninterface OrganisationProps extends StackProps {\n  organisationName: string;\n  accounts: AccountsConfig;\n  orgEmail: string;\n  existingAccounts?: ExistingAccounts[];\n}\n\ntype AccountsConfig = {\n  readonly [key: string]: readonly string[] | string;\n};\n\n/**\n * A construct for creating multi environment organisations with a production, staging and development account.\n */\n\nexport default class Organisation extends Construct {\n  public accountId: CfnOutput;\n\n  private existingAccounts?: ExistingAccounts[];\n  private accounts: KeyValue = {};\n  private organisation: Organization;\n  private organisationalUnits: OrganizationalUnit[] = [];\n\n  constructor(scope: Construct, id: string, props: OrganisationProps) {\n    super(scope, id);\n\n    this.existingAccounts = props.existingAccounts;\n    this.addOrganisation(props.organisationName);\n    this.addOrganisationUnitsAndAccounts(props.accounts, props.orgEmail);\n  }\n\n  private addOrganisation(organisationName: string) {\n    this.organisation = new Organization(this, organisationName, {\n      featureSet: FeatureSet.ALL\n    });\n\n    // TODO: Validate this enables trusted access\n    this.organisation.enableAwsServiceAccess(\"account.amazonaws.com\");\n\n    const enforcedPolicyTypes: PolicyType[] = [\n      PolicyType.SERVICE_CONTROL_POLICY,\n      PolicyType.TAG_POLICY,\n      PolicyType.BACKUP_POLICY,\n      PolicyType.AISERVICES_OPT_OUT_POLICY\n    ];\n\n    for (const policyType of enforcedPolicyTypes) {\n      this.organisation.enablePolicyType(policyType);\n    }\n  }\n\n  private addOrganisationUnitsAndAccounts(\n    accounts: AccountsConfig,\n    orgEmail: string\n  ) {\n    for (const [environmentType, accountList] of Object.entries(accounts)) {\n      // Create OU for each environment type\n      const ouName =\n        environmentType.charAt(0).toUpperCase() + environmentType.slice(1);\n      const orgUnit = this.addOrganisationalUnit(\n        `${ouName}OrganizationalUnit`,\n        ouName\n      );\n\n      // Convert single account to array for uniform processing\n      const accountsArray = Array.isArray(accountList)\n        ? accountList\n        : [accountList];\n\n      // Add accounts to this OU\n      for (const accountName of accountsArray) {\n        const accountNameId = stripAndCamelCase(accountName);\n\n        const importedAccount = this.existingAccounts?.find(\n          (account) => account.Name === accountName\n        );\n        const accountEmail = importedAccount\n          ? importedAccount.Email\n          : addSuffixToEmail(orgEmail, accountNameId.toLowerCase());\n\n        if (accountEmail) {\n          this.addAccount(\n            `${accountNameId}Account`,\n            accountName,\n            accountEmail,\n            { env: environmentType },\n            orgUnit\n          );\n        }\n      }\n    }\n  }\n\n  private addOrganisationalUnit(id: string, name: string): OrganizationalUnit {\n    const ou = new OrganizationalUnit(this, id, {\n      organizationalUnitName: name,\n      parent: this.organisation.root,\n      importOnDuplicate: true\n    });\n\n    this.organisationalUnits.push(ou);\n    return ou;\n  }\n\n  private addAccount(\n    id: string,\n    name: string,\n    email: string,\n    tags: { [key: string]: string },\n    organisationalUnit: OrganizationalUnit\n  ): Account {\n    const acc = new Account(this, id, {\n      accountName: name,\n      email: email,\n      parent: organisationalUnit,\n      importOnDuplicate: true\n    });\n\n    for (const tag in tags) {\n      Tags.of(acc).add(tag, tags[tag]);\n    }\n\n    this.accounts[name] = acc.accountId;\n\n    new CfnOutput(this, `${id}Id`, {\n      key: `${id}Id`,\n      value: acc.accountId,\n      exportName: `${id}Id`\n    });\n    new CfnOutput(this, `${id}Arn`, {\n      key: `${id}Arn`,\n      value: acc.accountArn,\n      exportName: `${id}Arn`\n    });\n\n    return acc;\n  }\n\n  public getAccounts() {\n    return this.accounts;\n  }\n}\n"]}

package/dist/lib/config/aws/organisationId.d.ts

@@ -0,0 +1,7 @@
+import { CfnOutput } from "aws-cdk-lib";
+import { Construct } from "constructs";
+export declare class OrganisationId extends Construct {
+    readonly organisationId: CfnOutput;
+    readonly organisationAccountArn: CfnOutput;
+    constructor(scope: Construct, id: string);
+}

package/dist/lib/config/aws/organisationId.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrganisationId = void 0;
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const customResources = require("aws-cdk-lib/custom-resources");
+const aws_iam_1 = require("aws-cdk-lib/aws-iam");
+const constructs_1 = require("constructs");
+const awsCustomResource_1 = require("../../resources/aws/utilities/awsCustomResource");
+class OrganisationId extends constructs_1.Construct {
+    constructor(scope, id) {
+        super(scope, id);
+        const organisation = new awsCustomResource_1.AwsCustomResource(this, "OrganisationResource", {
+            functionName: "organisationId",
+            onCreate: {
+                service: "organizations",
+                action: "DescribeOrganizationCommand", // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Organizations.html#describeOrganization-property
+                physicalResourceId: customResources.PhysicalResourceId.of("organisationId")
+            },
+            onUpdate: {
+                service: "organizations",
+                action: "DescribeOrganizationCommand", // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Organizations.html#describeOrganization-property
+                physicalResourceId: customResources.PhysicalResourceId.of("organisationId")
+            },
+            resourceType: "Custom::DescribeOrganisation",
+            policy: customResources.AwsCustomResourcePolicy.fromStatements([
+                new aws_iam_1.PolicyStatement({
+                    actions: ["organizations:DescribeOrganization"],
+                    resources: ["*"],
+                    effect: aws_iam_1.Effect.ALLOW
+                })
+            ])
+        });
+        this.organisationId = new aws_cdk_lib_1.CfnOutput(this, "OrganisationIdOutput", {
+            key: "OrganisationId",
+            value: organisation.getResponseField("Organization.Id"),
+            exportName: "OrganisationId"
+        });
+        this.organisationAccountArn = new aws_cdk_lib_1.CfnOutput(this, "OrganisationAccountArnOutput", {
+            key: "OrganisationAccountArn",
+            value: organisation.getResponseField("Organization.MasterAccountArn"),
+            exportName: "OrganisationAccountArn"
+        });
+    }
+}
+exports.OrganisationId = OrganisationId;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JnYW5pc2F0aW9uSWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9saWIvY29uZmlnL2F3cy9vcmdhbmlzYXRpb25JZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBd0M7QUFDeEMsZ0VBQWdFO0FBQ2hFLGlEQUE4RDtBQUM5RCwyQ0FBdUM7QUFFdkMsdUZBQW9GO0FBRXBGLE1BQWEsY0FBZSxTQUFRLHNCQUFTO0lBSTNDLFlBQVksS0FBZ0IsRUFBRSxFQUFVO1FBQ3RDLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsTUFBTSxZQUFZLEdBQUcsSUFBSSxxQ0FBaUIsQ0FBQyxJQUFJLEVBQUUsc0JBQXNCLEVBQUU7WUFDdkUsWUFBWSxFQUFFLGdCQUFnQjtZQUM5QixRQUFRLEVBQUU7Z0JBQ1IsT0FBTyxFQUFFLGVBQWU7Z0JBQ3hCLE1BQU0sRUFBRSw2QkFBNkIsRUFBRSwyR0FBMkc7Z0JBQ2xKLGtCQUFrQixFQUNoQixlQUFlLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDO2FBQzFEO1lBQ0QsUUFBUSxFQUFFO2dCQUNSLE9BQU8sRUFBRSxlQUFlO2dCQUN4QixNQUFNLEVBQUUsNkJBQTZCLEVBQUUsMkdBQTJHO2dCQUNsSixrQkFBa0IsRUFDaEIsZUFBZSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQzthQUMxRDtZQUNELFlBQVksRUFBRSw4QkFBOEI7WUFDNUMsTUFBTSxFQUFFLGVBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUM7Z0JBQzdELElBQUkseUJBQWUsQ0FBQztvQkFDbEIsT0FBTyxFQUFFLENBQUMsb0NBQW9DLENBQUM7b0JBQy9DLFNBQVMsRUFBRSxDQUFDLEdBQUcsQ0FBQztvQkFDaEIsTUFBTSxFQUFFLGdCQUFNLENBQUMsS0FBSztpQkFDckIsQ0FBQzthQUNILENBQUM7U0FDSCxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsc0JBQXNCLEVBQUU7WUFDaEUsR0FBRyxFQUFFLGdCQUFnQjtZQUNyQixLQUFLLEVBQUUsWUFBWSxDQUFDLGdCQUFnQixDQUFDLGlCQUFpQixDQUFDO1lBQ3ZELFVBQVUsRUFBRSxnQkFBZ0I7U0FDN0IsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLHNCQUFzQixHQUFHLElBQUksdUJBQVMsQ0FDekMsSUFBSSxFQUNKLDhCQUE4QixFQUM5QjtZQUNFLEdBQUcsRUFBRSx3QkFBd0I7WUFDN0IsS0FBSyxFQUFFLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQywrQkFBK0IsQ0FBQztZQUNyRSxVQUFVLEVBQUUsd0JBQXdCO1NBQ3JDLENBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQS9DRCx3Q0ErQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDZm5PdXRwdXQgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCAqIGFzIGN1c3RvbVJlc291cmNlcyBmcm9tIFwiYXdzLWNkay1saWIvY3VzdG9tLXJlc291cmNlc1wiO1xuaW1wb3J0IHsgRWZmZWN0LCBQb2xpY3lTdGF0ZW1lbnQgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWlhbVwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuaW1wb3J0IHsgQXdzQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiLi4vLi4vcmVzb3VyY2VzL2F3cy91dGlsaXRpZXMvYXdzQ3VzdG9tUmVzb3VyY2VcIjtcblxuZXhwb3J0IGNsYXNzIE9yZ2FuaXNhdGlvbklkIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IG9yZ2FuaXNhdGlvbklkOiBDZm5PdXRwdXQ7XG4gIHB1YmxpYyByZWFkb25seSBvcmdhbmlzYXRpb25BY2NvdW50QXJuOiBDZm5PdXRwdXQ7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICBjb25zdCBvcmdhbmlzYXRpb24gPSBuZXcgQXdzQ3VzdG9tUmVzb3VyY2UodGhpcywgXCJPcmdhbmlzYXRpb25SZXNvdXJjZVwiLCB7XG4gICAgICBmdW5jdGlvbk5hbWU6IFwib3JnYW5pc2F0aW9uSWRcIixcbiAgICAgIG9uQ3JlYXRlOiB7XG4gICAgICAgIHNlcnZpY2U6IFwib3JnYW5pemF0aW9uc1wiLFxuICAgICAgICBhY3Rpb246IFwiRGVzY3JpYmVPcmdhbml6YXRpb25Db21tYW5kXCIsIC8vIGh0dHBzOi8vZG9jcy5hd3MuYW1hem9uLmNvbS9BV1NKYXZhU2NyaXB0U0RLL2xhdGVzdC9BV1MvT3JnYW5pemF0aW9ucy5odG1sI2Rlc2NyaWJlT3JnYW5pemF0aW9uLXByb3BlcnR5XG4gICAgICAgIHBoeXNpY2FsUmVzb3VyY2VJZDpcbiAgICAgICAgICBjdXN0b21SZXNvdXJjZXMuUGh5c2ljYWxSZXNvdXJjZUlkLm9mKFwib3JnYW5pc2F0aW9uSWRcIilcbiAgICAgIH0sXG4gICAgICBvblVwZGF0ZToge1xuICAgICAgICBzZXJ2aWNlOiBcIm9yZ2FuaXphdGlvbnNcIixcbiAgICAgICAgYWN0aW9uOiBcIkRlc2NyaWJlT3JnYW5pemF0aW9uQ29tbWFuZFwiLCAvLyBodHRwczovL2RvY3MuYXdzLmFtYXpvbi5jb20vQVdTSmF2YVNjcmlwdFNESy9sYXRlc3QvQVdTL09yZ2FuaXphdGlvbnMuaHRtbCNkZXNjcmliZU9yZ2FuaXphdGlvbi1wcm9wZXJ0eVxuICAgICAgICBwaHlzaWNhbFJlc291cmNlSWQ6XG4gICAgICAgICAgY3VzdG9tUmVzb3VyY2VzLlBoeXNpY2FsUmVzb3VyY2VJZC5vZihcIm9yZ2FuaXNhdGlvbklkXCIpXG4gICAgICB9LFxuICAgICAgcmVzb3VyY2VUeXBlOiBcIkN1c3RvbTo6RGVzY3JpYmVPcmdhbmlzYXRpb25cIixcbiAgICAgIHBvbGljeTogY3VzdG9tUmVzb3VyY2VzLkF3c0N1c3RvbVJlc291cmNlUG9saWN5LmZyb21TdGF0ZW1lbnRzKFtcbiAgICAgICAgbmV3IFBvbGljeVN0YXRlbWVudCh7XG4gICAgICAgICAgYWN0aW9uczogW1wib3JnYW5pemF0aW9uczpEZXNjcmliZU9yZ2FuaXphdGlvblwiXSxcbiAgICAgICAgICByZXNvdXJjZXM6IFtcIipcIl0sXG4gICAgICAgICAgZWZmZWN0OiBFZmZlY3QuQUxMT1dcbiAgICAgICAgfSlcbiAgICAgIF0pXG4gICAgfSk7XG5cbiAgICB0aGlzLm9yZ2FuaXNhdGlvbklkID0gbmV3IENmbk91dHB1dCh0aGlzLCBcIk9yZ2FuaXNhdGlvbklkT3V0cHV0XCIsIHtcbiAgICAgIGtleTogXCJPcmdhbmlzYXRpb25JZFwiLFxuICAgICAgdmFsdWU6IG9yZ2FuaXNhdGlvbi5nZXRSZXNwb25zZUZpZWxkKFwiT3JnYW5pemF0aW9uLklkXCIpLFxuICAgICAgZXhwb3J0TmFtZTogXCJPcmdhbmlzYXRpb25JZFwiXG4gICAgfSk7XG5cbiAgICB0aGlzLm9yZ2FuaXNhdGlvbkFjY291bnRBcm4gPSBuZXcgQ2ZuT3V0cHV0KFxuICAgICAgdGhpcyxcbiAgICAgIFwiT3JnYW5pc2F0aW9uQWNjb3VudEFybk91dHB1dFwiLFxuICAgICAge1xuICAgICAgICBrZXk6IFwiT3JnYW5pc2F0aW9uQWNjb3VudEFyblwiLFxuICAgICAgICB2YWx1ZTogb3JnYW5pc2F0aW9uLmdldFJlc3BvbnNlRmllbGQoXCJPcmdhbml6YXRpb24uTWFzdGVyQWNjb3VudEFyblwiKSxcbiAgICAgICAgZXhwb3J0TmFtZTogXCJPcmdhbmlzYXRpb25BY2NvdW50QXJuXCJcbiAgICAgIH1cbiAgICApO1xuICB9XG59XG4iXX0=

package/dist/lib/config/aws/organisationsAccess.d.ts

@@ -0,0 +1,10 @@
+import { Construct } from "constructs";
+import { type StackProps } from "aws-cdk-lib";
+interface ActivateOrganisationsAccessProps extends StackProps {
+    account: string;
+    region: string;
+}
+export declare class ActivateOrganisationsAccess extends Construct {
+    constructor(scope: Construct, id: string, props: ActivateOrganisationsAccessProps);
+}
+export {};

package/dist/lib/config/aws/organisationsAccess.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActivateOrganisationsAccess = void 0;
+const customResources = require("aws-cdk-lib/custom-resources");
+const constructs_1 = require("constructs");
+const awsCustomResource_1 = require("../../resources/aws/utilities/awsCustomResource");
+const aws_iam_1 = require("aws-cdk-lib/aws-iam");
+class ActivateOrganisationsAccess extends constructs_1.Construct {
+    constructor(scope, id, props) {
+        super(scope, id);
+        new awsCustomResource_1.AwsCustomResource(this, "activateOrganisationsAccess", {
+            functionName: "activateOrganisationsAccess",
+            onCreate: {
+                service: "cloudformation",
+                action: "ActivateOrganizationsAccessCommand", // https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/cloudformation/command/ActivateOrganizationsAccessCommand/
+                parameters: {},
+                physicalResourceId: customResources.PhysicalResourceId.of("activateOrganisationsAccess")
+            },
+            resourceType: "Custom::ActivateOrganisationsAccess",
+            policy: customResources.AwsCustomResourcePolicy.fromStatements([
+                new aws_iam_1.PolicyStatement({
+                    actions: [
+                        "cloudformation:ActivateOrganizationsAccess",
+                        "cloudformation:DescribeOrganizationsAccess",
+                        "organizations:EnableAWSServiceAccess",
+                        "organizations:DescribeOrganization",
+                        "organizations:ListRoots",
+                        "organizations:ListAWSServiceAccessForOrganization",
+                        "organizations:DisableAWSServiceAccess",
+                        "iam:CreateServiceLinkedRole",
+                        "iam:GetRole"
+                    ],
+                    resources: [
+                        "*" // TODO: Figure out what access is required here
+                    ],
+                    effect: aws_iam_1.Effect.ALLOW
+                }),
+                new aws_iam_1.PolicyStatement({
+                    actions: ["cloudformation:ActivateOrganizationsAccess"],
+                    resources: [
+                        `arn:aws:cloudformation:${props.region}:${props.account}:stackset/*`
+                    ],
+                    effect: aws_iam_1.Effect.ALLOW
+                })
+            ])
+        });
+    }
+}
+exports.ActivateOrganisationsAccess = ActivateOrganisationsAccess;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JnYW5pc2F0aW9uc0FjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9jb25maWcvYXdzL29yZ2FuaXNhdGlvbnNBY2Nlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsZ0VBQWdFO0FBQ2hFLDJDQUF1QztBQUV2Qyx1RkFBb0Y7QUFDcEYsaURBQThEO0FBUTlELE1BQWEsMkJBQTRCLFNBQVEsc0JBQVM7SUFDeEQsWUFDRSxLQUFnQixFQUNoQixFQUFVLEVBQ1YsS0FBdUM7UUFFdkMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQixJQUFJLHFDQUFpQixDQUFDLElBQUksRUFBRSw2QkFBNkIsRUFBRTtZQUN6RCxZQUFZLEVBQUUsNkJBQTZCO1lBQzNDLFFBQVEsRUFBRTtnQkFDUixPQUFPLEVBQUUsZ0JBQWdCO2dCQUN6QixNQUFNLEVBQUUsb0NBQW9DLEVBQUUsMkhBQTJIO2dCQUN6SyxVQUFVLEVBQUUsRUFBRTtnQkFDZCxrQkFBa0IsRUFBRSxlQUFlLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUN2RCw2QkFBNkIsQ0FDOUI7YUFDRjtZQUNELFlBQVksRUFBRSxxQ0FBcUM7WUFDbkQsTUFBTSxFQUFFLGVBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUM7Z0JBQzdELElBQUkseUJBQWUsQ0FBQztvQkFDbEIsT0FBTyxFQUFFO3dCQUNQLDRDQUE0Qzt3QkFDNUMsNENBQTRDO3dCQUM1QyxzQ0FBc0M7d0JBQ3RDLG9DQUFvQzt3QkFDcEMseUJBQXlCO3dCQUN6QixtREFBbUQ7d0JBQ25ELHVDQUF1Qzt3QkFDdkMsNkJBQTZCO3dCQUM3QixhQUFhO3FCQUNkO29CQUNELFNBQVMsRUFBRTt3QkFDVCxHQUFHLENBQUMsZ0RBQWdEO3FCQUNyRDtvQkFDRCxNQUFNLEVBQUUsZ0JBQU0sQ0FBQyxLQUFLO2lCQUNyQixDQUFDO2dCQUNGLElBQUkseUJBQWUsQ0FBQztvQkFDbEIsT0FBTyxFQUFFLENBQUMsNENBQTRDLENBQUM7b0JBQ3ZELFNBQVMsRUFBRTt3QkFDVCwwQkFBMEIsS0FBSyxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUMsT0FBTyxhQUFhO3FCQUNyRTtvQkFDRCxNQUFNLEVBQUUsZ0JBQU0sQ0FBQyxLQUFLO2lCQUNyQixDQUFDO2FBQ0gsQ0FBQztTQUNILENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQS9DRCxrRUErQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBjdXN0b21SZXNvdXJjZXMgZnJvbSBcImF3cy1jZGstbGliL2N1c3RvbS1yZXNvdXJjZXNcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmltcG9ydCB7IEF3c0N1c3RvbVJlc291cmNlIH0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvdXRpbGl0aWVzL2F3c0N1c3RvbVJlc291cmNlXCI7XG5pbXBvcnQgeyBFZmZlY3QsIFBvbGljeVN0YXRlbWVudCB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtaWFtXCI7XG5pbXBvcnQgeyB0eXBlIFN0YWNrUHJvcHMgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcblxuaW50ZXJmYWNlIEFjdGl2YXRlT3JnYW5pc2F0aW9uc0FjY2Vzc1Byb3BzIGV4dGVuZHMgU3RhY2tQcm9wcyB7XG4gIGFjY291bnQ6IHN0cmluZztcbiAgcmVnaW9uOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjbGFzcyBBY3RpdmF0ZU9yZ2FuaXNhdGlvbnNBY2Nlc3MgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICBjb25zdHJ1Y3RvcihcbiAgICBzY29wZTogQ29uc3RydWN0LFxuICAgIGlkOiBzdHJpbmcsXG4gICAgcHJvcHM6IEFjdGl2YXRlT3JnYW5pc2F0aW9uc0FjY2Vzc1Byb3BzXG4gICkge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICBuZXcgQXdzQ3VzdG9tUmVzb3VyY2UodGhpcywgXCJhY3RpdmF0ZU9yZ2FuaXNhdGlvbnNBY2Nlc3NcIiwge1xuICAgICAgZnVuY3Rpb25OYW1lOiBcImFjdGl2YXRlT3JnYW5pc2F0aW9uc0FjY2Vzc1wiLFxuICAgICAgb25DcmVhdGU6IHtcbiAgICAgICAgc2VydmljZTogXCJjbG91ZGZvcm1hdGlvblwiLFxuICAgICAgICBhY3Rpb246IFwiQWN0aXZhdGVPcmdhbml6YXRpb25zQWNjZXNzQ29tbWFuZFwiLCAvLyBodHRwczovL2RvY3MuYXdzLmFtYXpvbi5jb20vQVdTSmF2YVNjcmlwdFNESy92My9sYXRlc3QvY2xpZW50L2Nsb3VkZm9ybWF0aW9uL2NvbW1hbmQvQWN0aXZhdGVPcmdhbml6YXRpb25zQWNjZXNzQ29tbWFuZC9cbiAgICAgICAgcGFyYW1ldGVyczoge30sXG4gICAgICAgIHBoeXNpY2FsUmVzb3VyY2VJZDogY3VzdG9tUmVzb3VyY2VzLlBoeXNpY2FsUmVzb3VyY2VJZC5vZihcbiAgICAgICAgICBcImFjdGl2YXRlT3JnYW5pc2F0aW9uc0FjY2Vzc1wiXG4gICAgICAgIClcbiAgICAgIH0sXG4gICAgICByZXNvdXJjZVR5cGU6IFwiQ3VzdG9tOjpBY3RpdmF0ZU9yZ2FuaXNhdGlvbnNBY2Nlc3NcIixcbiAgICAgIHBvbGljeTogY3VzdG9tUmVzb3VyY2VzLkF3c0N1c3RvbVJlc291cmNlUG9saWN5LmZyb21TdGF0ZW1lbnRzKFtcbiAgICAgICAgbmV3IFBvbGljeVN0YXRlbWVudCh7XG4gICAgICAgICAgYWN0aW9uczogW1xuICAgICAgICAgICAgXCJjbG91ZGZvcm1hdGlvbjpBY3RpdmF0ZU9yZ2FuaXphdGlvbnNBY2Nlc3NcIixcbiAgICAgICAgICAgIFwiY2xvdWRmb3JtYXRpb246RGVzY3JpYmVPcmdhbml6YXRpb25zQWNjZXNzXCIsXG4gICAgICAgICAgICBcIm9yZ2FuaXphdGlvbnM6RW5hYmxlQVdTU2VydmljZUFjY2Vzc1wiLFxuICAgICAgICAgICAgXCJvcmdhbml6YXRpb25zOkRlc2NyaWJlT3JnYW5pemF0aW9uXCIsXG4gICAgICAgICAgICBcIm9yZ2FuaXphdGlvbnM6TGlzdFJvb3RzXCIsXG4gICAgICAgICAgICBcIm9yZ2FuaXphdGlvbnM6TGlzdEFXU1NlcnZpY2VBY2Nlc3NGb3JPcmdhbml6YXRpb25cIixcbiAgICAgICAgICAgIFwib3JnYW5pemF0aW9uczpEaXNhYmxlQVdTU2VydmljZUFjY2Vzc1wiLFxuICAgICAgICAgICAgXCJpYW06Q3JlYXRlU2VydmljZUxpbmtlZFJvbGVcIixcbiAgICAgICAgICAgIFwiaWFtOkdldFJvbGVcIlxuICAgICAgICAgIF0sXG4gICAgICAgICAgcmVzb3VyY2VzOiBbXG4gICAgICAgICAgICBcIipcIiAvLyBUT0RPOiBGaWd1cmUgb3V0IHdoYXQgYWNjZXNzIGlzIHJlcXVpcmVkIGhlcmVcbiAgICAgICAgICBdLFxuICAgICAgICAgIGVmZmVjdDogRWZmZWN0LkFMTE9XXG4gICAgICAgIH0pLFxuICAgICAgICBuZXcgUG9saWN5U3RhdGVtZW50KHtcbiAgICAgICAgICBhY3Rpb25zOiBbXCJjbG91ZGZvcm1hdGlvbjpBY3RpdmF0ZU9yZ2FuaXphdGlvbnNBY2Nlc3NcIl0sXG4gICAgICAgICAgcmVzb3VyY2VzOiBbXG4gICAgICAgICAgICBgYXJuOmF3czpjbG91ZGZvcm1hdGlvbjoke3Byb3BzLnJlZ2lvbn06JHtwcm9wcy5hY2NvdW50fTpzdGFja3NldC8qYFxuICAgICAgICAgIF0sXG4gICAgICAgICAgZWZmZWN0OiBFZmZlY3QuQUxMT1dcbiAgICAgICAgfSlcbiAgICAgIF0pXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==

package/dist/lib/config/aws/ramSharing.d.ts

@@ -0,0 +1,4 @@
+import { Construct } from "constructs";
+export declare class RamSharing extends Construct {
+    constructor(scope: Construct, id: string);
+}

package/dist/lib/config/aws/ramSharing.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RamSharing = void 0;
+const customResources = require("aws-cdk-lib/custom-resources");
+const aws_iam_1 = require("aws-cdk-lib/aws-iam");
+const constructs_1 = require("constructs");
+const awsCustomResource_1 = require("../../resources/aws/utilities/awsCustomResource");
+class RamSharing extends constructs_1.Construct {
+    constructor(scope, id) {
+        super(scope, id);
+        new awsCustomResource_1.AwsCustomResource(this, "enableRamSharing", {
+            functionName: "enableRamSharing",
+            onCreate: {
+                service: "RAM",
+                action: "enableSharingWithAwsOrganization", // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/RAM.html#enableSharingWithAwsOrganization-property
+                parameters: {},
+                physicalResourceId: customResources.PhysicalResourceId.of("enableRamSharing")
+            },
+            resourceType: "Custom::ram",
+            policy: customResources.AwsCustomResourcePolicy.fromStatements([
+                new aws_iam_1.PolicyStatement({
+                    actions: [
+                        "ram:EnableSharingWithAwsOrganization",
+                        "iam:CreateServiceLinkedRole",
+                        "organizations:enableAWSServiceAccess",
+                        "organizations:DescribeOrganization"
+                    ],
+                    resources: ["*"] // TODO: Find out the exact pricipal for this
+                })
+            ])
+        });
+    }
+}
+exports.RamSharing = RamSharing;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmFtU2hhcmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9jb25maWcvYXdzL3JhbVNoYXJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsZ0VBQWdFO0FBQ2hFLGlEQUFzRDtBQUN0RCwyQ0FBdUM7QUFFdkMsdUZBQW9GO0FBRXBGLE1BQWEsVUFBVyxTQUFRLHNCQUFTO0lBQ3ZDLFlBQVksS0FBZ0IsRUFBRSxFQUFVO1FBQ3RDLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxxQ0FBaUIsQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLEVBQUU7WUFDOUMsWUFBWSxFQUFFLGtCQUFrQjtZQUNoQyxRQUFRLEVBQUU7Z0JBQ1IsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsTUFBTSxFQUFFLGtDQUFrQyxFQUFFLDZHQUE2RztnQkFDekosVUFBVSxFQUFFLEVBQUU7Z0JBQ2Qsa0JBQWtCLEVBQ2hCLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsa0JBQWtCLENBQUM7YUFDNUQ7WUFDRCxZQUFZLEVBQUUsYUFBYTtZQUMzQixNQUFNLEVBQUUsZUFBZSxDQUFDLHVCQUF1QixDQUFDLGNBQWMsQ0FBQztnQkFDN0QsSUFBSSx5QkFBZSxDQUFDO29CQUNsQixPQUFPLEVBQUU7d0JBQ1Asc0NBQXNDO3dCQUN0Qyw2QkFBNkI7d0JBQzdCLHNDQUFzQzt3QkFDdEMsb0NBQW9DO3FCQUNyQztvQkFDRCxTQUFTLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyw2Q0FBNkM7aUJBQy9ELENBQUM7YUFDSCxDQUFDO1NBQ0gsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBM0JELGdDQTJCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIGN1c3RvbVJlc291cmNlcyBmcm9tIFwiYXdzLWNkay1saWIvY3VzdG9tLXJlc291cmNlc1wiO1xuaW1wb3J0IHsgUG9saWN5U3RhdGVtZW50IH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1pYW1cIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmltcG9ydCB7IEF3c0N1c3RvbVJlc291cmNlIH0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvdXRpbGl0aWVzL2F3c0N1c3RvbVJlc291cmNlXCI7XG5cbmV4cG9ydCBjbGFzcyBSYW1TaGFyaW5nIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICBuZXcgQXdzQ3VzdG9tUmVzb3VyY2UodGhpcywgXCJlbmFibGVSYW1TaGFyaW5nXCIsIHtcbiAgICAgIGZ1bmN0aW9uTmFtZTogXCJlbmFibGVSYW1TaGFyaW5nXCIsXG4gICAgICBvbkNyZWF0ZToge1xuICAgICAgICBzZXJ2aWNlOiBcIlJBTVwiLFxuICAgICAgICBhY3Rpb246IFwiZW5hYmxlU2hhcmluZ1dpdGhBd3NPcmdhbml6YXRpb25cIiwgLy8gaHR0cHM6Ly9kb2NzLmF3cy5hbWF6b24uY29tL0FXU0phdmFTY3JpcHRTREsvbGF0ZXN0L0FXUy9SQU0uaHRtbCNlbmFibGVTaGFyaW5nV2l0aEF3c09yZ2FuaXphdGlvbi1wcm9wZXJ0eVxuICAgICAgICBwYXJhbWV0ZXJzOiB7fSxcbiAgICAgICAgcGh5c2ljYWxSZXNvdXJjZUlkOlxuICAgICAgICAgIGN1c3RvbVJlc291cmNlcy5QaHlzaWNhbFJlc291cmNlSWQub2YoXCJlbmFibGVSYW1TaGFyaW5nXCIpXG4gICAgICB9LFxuICAgICAgcmVzb3VyY2VUeXBlOiBcIkN1c3RvbTo6cmFtXCIsXG4gICAgICBwb2xpY3k6IGN1c3RvbVJlc291cmNlcy5Bd3NDdXN0b21SZXNvdXJjZVBvbGljeS5mcm9tU3RhdGVtZW50cyhbXG4gICAgICAgIG5ldyBQb2xpY3lTdGF0ZW1lbnQoe1xuICAgICAgICAgIGFjdGlvbnM6IFtcbiAgICAgICAgICAgIFwicmFtOkVuYWJsZVNoYXJpbmdXaXRoQXdzT3JnYW5pemF0aW9uXCIsXG4gICAgICAgICAgICBcImlhbTpDcmVhdGVTZXJ2aWNlTGlua2VkUm9sZVwiLFxuICAgICAgICAgICAgXCJvcmdhbml6YXRpb25zOmVuYWJsZUFXU1NlcnZpY2VBY2Nlc3NcIixcbiAgICAgICAgICAgIFwib3JnYW5pemF0aW9uczpEZXNjcmliZU9yZ2FuaXphdGlvblwiXG4gICAgICAgICAgXSxcbiAgICAgICAgICByZXNvdXJjZXM6IFtcIipcIl0gLy8gVE9ETzogRmluZCBvdXQgdGhlIGV4YWN0IHByaWNpcGFsIGZvciB0aGlzXG4gICAgICAgIH0pXG4gICAgICBdKVxuICAgIH0pO1xuICB9XG59XG4iXX0=

package/dist/lib/config/monitoring.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Monitoring configuration for cross-account access
+ */
+export declare const FJALL_MONITORING_CONFIG: {
+    /**
+     * Fjall webapp AWS account ID
+     * This account will be granted permission to assume monitoring roles
+     */
+    readonly webappAwsAccountId: "985539798308";
+    /**
+     * IAM role naming convention
+     */
+    readonly roleNamePrefix: "FjallMonitoring";
+    /**
+     * IAM role path (for organizational structure)
+     */
+    readonly rolePath: "/";
+};

package/dist/lib/config/monitoring.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FJALL_MONITORING_CONFIG = void 0;
+/**
+ * Monitoring configuration for cross-account access
+ */
+exports.FJALL_MONITORING_CONFIG = {
+    /**
+     * Fjall webapp AWS account ID
+     * This account will be granted permission to assume monitoring roles
+     */
+    webappAwsAccountId: "985539798308", // Fjall platform account
+    /**
+     * IAM role naming convention
+     */
+    roleNamePrefix: "FjallMonitoring",
+    /**
+     * IAM role path (for organizational structure)
+     */
+    rolePath: "/"
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9uaXRvcmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi9jb25maWcvbW9uaXRvcmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7R0FFRztBQUNVLFFBQUEsdUJBQXVCLEdBQUc7SUFDckM7OztPQUdHO0lBQ0gsa0JBQWtCLEVBQUUsY0FBYyxFQUFFLHlCQUF5QjtJQUU3RDs7T0FFRztJQUNILGNBQWMsRUFBRSxpQkFBaUI7SUFFakM7O09BRUc7SUFDSCxRQUFRLEVBQUUsR0FBRztDQUNMLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIE1vbml0b3JpbmcgY29uZmlndXJhdGlvbiBmb3IgY3Jvc3MtYWNjb3VudCBhY2Nlc3NcbiAqL1xuZXhwb3J0IGNvbnN0IEZKQUxMX01PTklUT1JJTkdfQ09ORklHID0ge1xuICAvKipcbiAgICogRmphbGwgd2ViYXBwIEFXUyBhY2NvdW50IElEXG4gICAqIFRoaXMgYWNjb3VudCB3aWxsIGJlIGdyYW50ZWQgcGVybWlzc2lvbiB0byBhc3N1bWUgbW9uaXRvcmluZyByb2xlc1xuICAgKi9cbiAgd2ViYXBwQXdzQWNjb3VudElkOiBcIjk4NTUzOTc5ODMwOFwiLCAvLyBGamFsbCBwbGF0Zm9ybSBhY2NvdW50XG5cbiAgLyoqXG4gICAqIElBTSByb2xlIG5hbWluZyBjb252ZW50aW9uXG4gICAqL1xuICByb2xlTmFtZVByZWZpeDogXCJGamFsbE1vbml0b3JpbmdcIixcblxuICAvKipcbiAgICogSUFNIHJvbGUgcGF0aCAoZm9yIG9yZ2FuaXphdGlvbmFsIHN0cnVjdHVyZSlcbiAgICovXG4gIHJvbGVQYXRoOiBcIi9cIlxufSBhcyBjb25zdDtcbiJdfQ==

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

@@ -0,0 +1,67 @@
+import { Construct } from "constructs";
+import { type Role } from "aws-cdk-lib/aws-iam";
+import { type CICDProvider } from "../../resources/aws/cicd/cicdRole";
+export interface CICDRoleProps {
+    /**
+     * The CI/CD provider (github-actions, buildkite, gitlab-ci)
+     */
+    provider: CICDProvider;
+    /**
+     * For GitHub Actions: repository in format "org/repo"
+     * For Buildkite: organization slug
+     * For GitLab CI: project path in format "group/project"
+     */
+    repositoryOrOrg: string;
+    /**
+     * Optional custom role name
+     * Defaults to "FjallDeploy-{provider}-{appName}"
+     */
+    roleName?: string;
+    /**
+     * Optional ARN of existing OIDC provider (skips creation)
+     * Useful when OIDC provider already exists in the account
+     */
+    existingProviderArn?: string;
+}
+/**
+ * High-level pattern for adding CI/CD OIDC authentication to an application.
+ *
+ * This creates an OIDC provider (if needed) and a deploy role that can be assumed
+ * by your CI/CD system without long-lived credentials.
+ *
+ * @example
+ * ```typescript
+ * import { App, CICDRole } from "@fjall/components-infrastructure";
+ *
+ * const app = App.getApp("MyApp");
+ *
+ * // Add GitHub Actions OIDC authentication
+ * const cicdRole = new CICDRole(app, "GitHubDeployRole", {
+ *   provider: "github-actions",
+ *   repositoryOrOrg: "myorg/myrepo"
+ * });
+ *
+ * // Continue with normal application setup
+ * app.addCompute(/* ... *\/);
+ * ```
+ *
+ * @example
+ * ```typescript
+ * // Use existing OIDC provider (created via fjall cicd setup)
+ * const cicdRole = new CICDRole(app, "GitHubDeployRole", {
+ *   provider: "github-actions",
+ *   repositoryOrOrg: "myorg/myrepo",
+ *   existingProviderArn: "arn:aws:iam::123456789012:oidc-provider/token.actions.githubusercontent.com"
+ * });
+ * ```
+ */
+export declare class CICDRole extends Construct {
+    readonly role: Role;
+    readonly provider: CICDProvider;
+    constructor(scope: Construct, id: string, props: CICDRoleProps);
+    /**
+     * Get the role ARN for use in CI/CD configuration
+     */
+    getRoleArn(): string;
+}
+export default CICDRole;

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

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CICDRole = void 0;
+const constructs_1 = require("constructs");
+const app_1 = require("../../app");
+const cicdRole_1 = require("../../resources/aws/cicd/cicdRole");
+/**
+ * High-level pattern for adding CI/CD OIDC authentication to an application.
+ *
+ * This creates an OIDC provider (if needed) and a deploy role that can be assumed
+ * by your CI/CD system without long-lived credentials.
+ *
+ * @example
+ * ```typescript
+ * import { App, CICDRole } from "@fjall/components-infrastructure";
+ *
+ * const app = App.getApp("MyApp");
+ *
+ * // Add GitHub Actions OIDC authentication
+ * const cicdRole = new CICDRole(app, "GitHubDeployRole", {
+ *   provider: "github-actions",
+ *   repositoryOrOrg: "myorg/myrepo"
+ * });
+ *
+ * // Continue with normal application setup
+ * app.addCompute(/* ... *\/);
+ * ```
+ *
+ * @example
+ * ```typescript
+ * // Use existing OIDC provider (created via fjall cicd setup)
+ * const cicdRole = new CICDRole(app, "GitHubDeployRole", {
+ *   provider: "github-actions",
+ *   repositoryOrOrg: "myorg/myrepo",
+ *   existingProviderArn: "arn:aws:iam::123456789012:oidc-provider/token.actions.githubusercontent.com"
+ * });
+ * ```
+ */
+class CICDRole extends constructs_1.Construct {
+    constructor(scope, id, props) {
+        super(scope, id);
+        // Get the App instance
+        const app = scope instanceof app_1.default ? scope : app_1.default.getInstance();
+        const networkStack = app.getDefaultNetworkStack();
+        this.provider = props.provider;
+        // Build the config for the factory
+        const config = {
+            provider: props.provider,
+            appName: app["name"],
+            repositoryOrOrg: props.repositoryOrOrg,
+            roleName: props.roleName,
+            existingProviderArn: props.existingProviderArn
+        };
+        // Create the CI/CD role using the factory
+        this.role = cicdRole_1.default.build(`${app["name"]}CICDRole`, config)(app, networkStack.getStack());
+        // Register the role with the network stack
+        networkStack.addConstruct(this.role);
+    }
+    /**
+     * Get the role ARN for use in CI/CD configuration
+     */
+    getRoleArn() {
+        return this.role.roleArn;
+    }
+}
+exports.CICDRole = CICDRole;
+exports.default = CICDRole;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ljZFJvbGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9saWIvcGF0dGVybnMvYXdzL2NpY2RSb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJDQUF1QztBQUV2QyxtQ0FBNEI7QUFDNUIsZ0VBRzJDO0FBNEIzQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQStCRztBQUNILE1BQWEsUUFBUyxTQUFRLHNCQUFTO0lBSXJDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBb0I7UUFDNUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQix1QkFBdUI7UUFDdkIsTUFBTSxHQUFHLEdBQUcsS0FBSyxZQUFZLGFBQUcsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxhQUFHLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDN0QsTUFBTSxZQUFZLEdBQUcsR0FBRyxDQUFDLHNCQUFzQixFQUFFLENBQUM7UUFFbEQsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUMsUUFBUSxDQUFDO1FBRS9CLG1DQUFtQztRQUNuQyxNQUFNLE1BQU0sR0FBbUI7WUFDN0IsUUFBUSxFQUFFLEtBQUssQ0FBQyxRQUFRO1lBQ3hCLE9BQU8sRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3BCLGVBQWUsRUFBRSxLQUFLLENBQUMsZUFBZTtZQUN0QyxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDeEIsbUJBQW1CLEVBQUUsS0FBSyxDQUFDLG1CQUFtQjtTQUMvQyxDQUFDO1FBRUYsMENBQTBDO1FBQzFDLElBQUksQ0FBQyxJQUFJLEdBQUcsa0JBQWUsQ0FBQyxLQUFLLENBQUMsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FDakUsR0FBRyxFQUNILFlBQVksQ0FBQyxRQUFRLEVBQUUsQ0FDeEIsQ0FBQztRQUVGLDJDQUEyQztRQUMzQyxZQUFZLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxVQUFVO1FBQ2YsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUMzQixDQUFDO0NBQ0Y7QUF0Q0QsNEJBc0NDO0FBRUQsa0JBQWUsUUFBUSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IHR5cGUgUm9sZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtaWFtXCI7XG5pbXBvcnQgQXBwIGZyb20gXCIuLi8uLi9hcHBcIjtcbmltcG9ydCBDSUNEUm9sZUZhY3RvcnksIHtcbiAgdHlwZSBDSUNEUHJvdmlkZXIsXG4gIHR5cGUgQ0lDRFJvbGVDb25maWdcbn0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvY2ljZC9jaWNkUm9sZVwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIENJQ0RSb2xlUHJvcHMge1xuICAvKipcbiAgICogVGhlIENJL0NEIHByb3ZpZGVyIChnaXRodWItYWN0aW9ucywgYnVpbGRraXRlLCBnaXRsYWItY2kpXG4gICAqL1xuICBwcm92aWRlcjogQ0lDRFByb3ZpZGVyO1xuXG4gIC8qKlxuICAgKiBGb3IgR2l0SHViIEFjdGlvbnM6IHJlcG9zaXRvcnkgaW4gZm9ybWF0IFwib3JnL3JlcG9cIlxuICAgKiBGb3IgQnVpbGRraXRlOiBvcmdhbml6YXRpb24gc2x1Z1xuICAgKiBGb3IgR2l0TGFiIENJOiBwcm9qZWN0IHBhdGggaW4gZm9ybWF0IFwiZ3JvdXAvcHJvamVjdFwiXG4gICAqL1xuICByZXBvc2l0b3J5T3JPcmc6IHN0cmluZztcblxuICAvKipcbiAgICogT3B0aW9uYWwgY3VzdG9tIHJvbGUgbmFtZVxuICAgKiBEZWZhdWx0cyB0byBcIkZqYWxsRGVwbG95LXtwcm92aWRlcn0te2FwcE5hbWV9XCJcbiAgICovXG4gIHJvbGVOYW1lPzogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBBUk4gb2YgZXhpc3RpbmcgT0lEQyBwcm92aWRlciAoc2tpcHMgY3JlYXRpb24pXG4gICAqIFVzZWZ1bCB3aGVuIE9JREMgcHJvdmlkZXIgYWxyZWFkeSBleGlzdHMgaW4gdGhlIGFjY291bnRcbiAgICovXG4gIGV4aXN0aW5nUHJvdmlkZXJBcm4/OiBzdHJpbmc7XG59XG5cbi8qKlxuICogSGlnaC1sZXZlbCBwYXR0ZXJuIGZvciBhZGRpbmcgQ0kvQ0QgT0lEQyBhdXRoZW50aWNhdGlvbiB0byBhbiBhcHBsaWNhdGlvbi5cbiAqXG4gKiBUaGlzIGNyZWF0ZXMgYW4gT0lEQyBwcm92aWRlciAoaWYgbmVlZGVkKSBhbmQgYSBkZXBsb3kgcm9sZSB0aGF0IGNhbiBiZSBhc3N1bWVkXG4gKiBieSB5b3VyIENJL0NEIHN5c3RlbSB3aXRob3V0IGxvbmctbGl2ZWQgY3JlZGVudGlhbHMuXG4gKlxuICogQGV4YW1wbGVcbiAqIGBgYHR5cGVzY3JpcHRcbiAqIGltcG9ydCB7IEFwcCwgQ0lDRFJvbGUgfSBmcm9tIFwiQGZqYWxsL2NvbXBvbmVudHMtaW5mcmFzdHJ1Y3R1cmVcIjtcbiAqXG4gKiBjb25zdCBhcHAgPSBBcHAuZ2V0QXBwKFwiTXlBcHBcIik7XG4gKlxuICogLy8gQWRkIEdpdEh1YiBBY3Rpb25zIE9JREMgYXV0aGVudGljYXRpb25cbiAqIGNvbnN0IGNpY2RSb2xlID0gbmV3IENJQ0RSb2xlKGFwcCwgXCJHaXRIdWJEZXBsb3lSb2xlXCIsIHtcbiAqICAgcHJvdmlkZXI6IFwiZ2l0aHViLWFjdGlvbnNcIixcbiAqICAgcmVwb3NpdG9yeU9yT3JnOiBcIm15b3JnL215cmVwb1wiXG4gKiB9KTtcbiAqXG4gKiAvLyBDb250aW51ZSB3aXRoIG5vcm1hbCBhcHBsaWNhdGlvbiBzZXR1cFxuICogYXBwLmFkZENvbXB1dGUoLyogLi4uICpcXC8pO1xuICogYGBgXG4gKlxuICogQGV4YW1wbGVcbiAqIGBgYHR5cGVzY3JpcHRcbiAqIC8vIFVzZSBleGlzdGluZyBPSURDIHByb3ZpZGVyIChjcmVhdGVkIHZpYSBmamFsbCBjaWNkIHNldHVwKVxuICogY29uc3QgY2ljZFJvbGUgPSBuZXcgQ0lDRFJvbGUoYXBwLCBcIkdpdEh1YkRlcGxveVJvbGVcIiwge1xuICogICBwcm92aWRlcjogXCJnaXRodWItYWN0aW9uc1wiLFxuICogICByZXBvc2l0b3J5T3JPcmc6IFwibXlvcmcvbXlyZXBvXCIsXG4gKiAgIGV4aXN0aW5nUHJvdmlkZXJBcm46IFwiYXJuOmF3czppYW06OjEyMzQ1Njc4OTAxMjpvaWRjLXByb3ZpZGVyL3Rva2VuLmFjdGlvbnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tXCJcbiAqIH0pO1xuICogYGBgXG4gKi9cbmV4cG9ydCBjbGFzcyBDSUNEUm9sZSBleHRlbmRzIENvbnN0cnVjdCB7XG4gIHB1YmxpYyByZWFkb25seSByb2xlOiBSb2xlO1xuICBwdWJsaWMgcmVhZG9ubHkgcHJvdmlkZXI6IENJQ0RQcm92aWRlcjtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogQ0lDRFJvbGVQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICAvLyBHZXQgdGhlIEFwcCBpbnN0YW5jZVxuICAgIGNvbnN0IGFwcCA9IHNjb3BlIGluc3RhbmNlb2YgQXBwID8gc2NvcGUgOiBBcHAuZ2V0SW5zdGFuY2UoKTtcbiAgICBjb25zdCBuZXR3b3JrU3RhY2sgPSBhcHAuZ2V0RGVmYXVsdE5ldHdvcmtTdGFjaygpO1xuXG4gICAgdGhpcy5wcm92aWRlciA9IHByb3BzLnByb3ZpZGVyO1xuXG4gICAgLy8gQnVpbGQgdGhlIGNvbmZpZyBmb3IgdGhlIGZhY3RvcnlcbiAgICBjb25zdCBjb25maWc6IENJQ0RSb2xlQ29uZmlnID0ge1xuICAgICAgcHJvdmlkZXI6IHByb3BzLnByb3ZpZGVyLFxuICAgICAgYXBwTmFtZTogYXBwW1wibmFtZVwiXSxcbiAgICAgIHJlcG9zaXRvcnlPck9yZzogcHJvcHMucmVwb3NpdG9yeU9yT3JnLFxuICAgICAgcm9sZU5hbWU6IHByb3BzLnJvbGVOYW1lLFxuICAgICAgZXhpc3RpbmdQcm92aWRlckFybjogcHJvcHMuZXhpc3RpbmdQcm92aWRlckFyblxuICAgIH07XG5cbiAgICAvLyBDcmVhdGUgdGhlIENJL0NEIHJvbGUgdXNpbmcgdGhlIGZhY3RvcnlcbiAgICB0aGlzLnJvbGUgPSBDSUNEUm9sZUZhY3RvcnkuYnVpbGQoYCR7YXBwW1wibmFtZVwiXX1DSUNEUm9sZWAsIGNvbmZpZykoXG4gICAgICBhcHAsXG4gICAgICBuZXR3b3JrU3RhY2suZ2V0U3RhY2soKVxuICAgICk7XG5cbiAgICAvLyBSZWdpc3RlciB0aGUgcm9sZSB3aXRoIHRoZSBuZXR3b3JrIHN0YWNrXG4gICAgbmV0d29ya1N0YWNrLmFkZENvbnN0cnVjdCh0aGlzLnJvbGUpO1xuICB9XG5cbiAgLyoqXG4gICAqIEdldCB0aGUgcm9sZSBBUk4gZm9yIHVzZSBpbiBDSS9DRCBjb25maWd1cmF0aW9uXG4gICAqL1xuICBwdWJsaWMgZ2V0Um9sZUFybigpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLnJvbGUucm9sZUFybjtcbiAgfVxufVxuXG5leHBvcnQgZGVmYXVsdCBDSUNEUm9sZTtcbiJdfQ==

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

@@ -221,6 +221,10 @@ export class ComputeFactory {
                         ...computeProps,
                         appName: app.getName()
                     };
+                    // `ecrRepository` is already defaulted to the app's shared default
+                    // container registry above (line ~323) when omitted — the same
+                    // repo ECS services push into — so a container Lambda always has
+                    // one by this point, whether or not `docker` is set.
                     // Always register Lambda with manifest collector for CLI discovery
                     // This ensures all Lambdas are discoverable for secrets management,
                     // even those that don't currently have secrets configured
@@ -242,6 +246,11 @@ export class ComputeFactory {
                     if (lambdaImportedSecretNames.size > 0) {
                         manifestLambda.importedSecretNames = Array.from(lambdaImportedSecretNames);
                     }
+                    if (lambdaComputeProps.deployment === "container" &&
+                        lambdaComputeProps.docker !== undefined) {
+                        manifestLambda.docker = lambdaComputeProps.docker;
+                        manifestLambda.imageKey = lambdaComputeProps.image ?? id;
+                    }
                     collector.addLambda(manifestLambda);
                     return new LambdaCompute(scope, id, lambdaComputeProps);
                 }

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

@@ -8,6 +8,7 @@ import { type ILambdaCompute } from "./interfaces/compute.js";
 import { type ConnectionSpec } from "./interfaces/connector.js";
 import { LambdaFunction } from "../../resources/aws/compute/lambda.js";
 import { type SecretImport } from "../../resources/aws/secrets/index.js";
+import { type DockerBuild } from "@fjall/util/manifest/schemas";
 export { Architecture, HttpMethod, InvokeMode, type FunctionUrlCorsOptions } from "aws-cdk-lib/aws-lambda";
 /**
  * Lambda function URL configuration.
@@ -114,17 +115,47 @@ interface BaseLambdaProps {
  * automatically set to FROM_IMAGE.
  *
  * @example
+ * // Bring your own image (built/pushed out of band)
  * app.addCompute(ComputeFactory.build("ImageLambda", {
  *   type: "lambda",
  *   deployment: "container",
  *   ecrRepository: app.getDefaultContainerRegistry()
  * }));
+ *
+ * @example
+ * // fjall builds and pushes the image on every `fjall deploy`
+ * app.addCompute(ComputeFactory.build("ImageLambda", {
+ *   type: "lambda",
+ *   deployment: "container",
+ *   docker: { path: "lambda.Dockerfile" }
+ * }));
  */
 export interface ContainerLambdaProps extends BaseLambdaProps {
     /** Container-based deployment using ECR image */
     deployment: "container";
-    /** ECR repository containing the Lambda container image */
-    ecrRepository: Repository | RepositoryImage;
+    /**
+     * ECR repository containing the Lambda container image. Optional when
+     * `docker` is set — defaults to the app's shared default container
+     * registry (the same repo ECS services push into).
+     */
+    ecrRepository?: Repository | RepositoryImage;
+    /**
+     * When set, `fjall deploy` builds and pushes this Dockerfile into the app's
+     * shared default container registry, then wires the function to the
+     * resulting content-hash-tagged image — the same mechanism ECS services
+     * already use. Omit to keep managing the image out of band (the previous
+     * behaviour: the function tracks a moving `:latest` tag in `ecrRepository`).
+     */
+    docker?: DockerBuild;
+    /**
+     * Shared build/tag key for Lambda functions that intentionally run the
+     * same container image (e.g. several handlers packaged from one
+     * Dockerfile). Functions sharing one `image` value build once and share
+     * one content-hash tag. Defaults to this Lambda's own construct id, so
+     * omitting it is safe when no sharing is intended. Only meaningful when
+     * `docker` is set.
+     */
+    image?: string;
 }
 /**
  * Code-based Lambda using inline code or S3.
@@ -177,8 +208,12 @@ export interface ResolvedLambdaDeployment {
 /**
  * Resolve Lambda deployment configuration from props.
  * Handles container vs code deployment types.
+ *
+ * `scope`/`id` are only used on the container-with-`docker` path, to create
+ * (or reuse) the per-key `CfnParameter` that `fjall deploy` overrides with
+ * the content-hash tag after building and pushing the image.
  */
-export declare function resolveLambdaDeployment(props: LambdaComputeProps): ResolvedLambdaDeployment;
+export declare function resolveLambdaDeployment(scope: Construct, id: string, props: LambdaComputeProps): ResolvedLambdaDeployment;
 /**
  * Lambda compute wrapper implementing ILambdaCompute.
  * Provides type-safe access to Lambda-specific resources.

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

@@ -4,18 +4,45 @@ import { Repository } from "aws-cdk-lib/aws-ecr";
 import { Construct } from "constructs";
 import { processConnections } from "../../utils/connections.js";
 import { LambdaFunction } from "../../resources/aws/compute/lambda.js";
+import { getOrCreateImageTagParameter } from "../../resources/aws/compute/imageTagParameter.js";
 import { COMPUTE_DEFAULTS } from "./compute.js";
+import { evaluateBakeGuard } from "@fjall/util/docker";
+import { toKebab } from "@fjall/util";
 // Re-export Lambda types from CDK for user convenience
 export { Architecture, HttpMethod, InvokeMode } from "aws-cdk-lib/aws-lambda";
 /**
  * Resolve Lambda deployment configuration from props.
  * Handles container vs code deployment types.
+ *
+ * `scope`/`id` are only used on the container-with-`docker` path, to create
+ * (or reuse) the per-key `CfnParameter` that `fjall deploy` overrides with
+ * the content-hash tag after building and pushing the image.
  */
-export function resolveLambdaDeployment(props) {
+export function resolveLambdaDeployment(scope, id, props) {
     if (props.deployment === "container") {
+        if (!props.ecrRepository) {
+            throw new Error(`Lambda '${id}': ecrRepository is required unless \`docker\` is set ` +
+                "(ComputeFactory fills it in automatically from the app's default container registry when docker is present).");
+        }
         if (!(props.ecrRepository instanceof Repository)) {
             throw new Error("ecrRepository must be a Repository instance for Lambda compute type");
         }
+        if (props.docker !== undefined) {
+            const appPrefix = props.appName !== undefined ? toKebab(props.appName) : "";
+            const findings = evaluateBakeGuard(props.docker.buildArgs, appPrefix).findings;
+            if (findings.length > 0) {
+                throw new Error(`Lambda '${id}': ${findings.map((f) => f.message).join(" ")}`);
+            }
+            const tagKey = props.image ?? id;
+            const param = getOrCreateImageTagParameter(scope, tagKey);
+            return {
+                code: Code.fromEcrImage(props.ecrRepository, {
+                    tagOrDigest: param.valueAsString
+                }),
+                handler: Handler.FROM_IMAGE,
+                runtime: Runtime.FROM_IMAGE
+            };
+        }
         return {
             code: Code.fromEcrImage(props.ecrRepository, {
                 tagOrDigest: COMPUTE_DEFAULTS.ECS.IMAGE_TAG
@@ -40,7 +67,7 @@ export class LambdaCompute extends Construct {
     lambdaFunction;
     constructor(scope, id, props) {
         super(scope, id);
-        const { code, handler, runtime } = resolveLambdaDeployment(props);
+        const { code, handler, runtime } = resolveLambdaDeployment(scope, id, props);
         // Convert presence-based functionUrl config to legacy boolean format
         const functionUrlConfig = props.functionUrl;
         const enableFunctionUrl = functionUrlConfig !== undefined && functionUrlConfig !== false;