@fjall/components-infrastructure 0.1.10 → 0.1.16

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

@@ -4,23 +4,24 @@ 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 aws_cdk_lib_1.Stack {
+class OrganisationId extends constructs_1.Construct {
     constructor(scope, id) {
         super(scope, id);
-        const organisation = new awsCustomResource_1.AwsCustomResource(this, "ipamDelegateAdmin", {
+        const organisation = new awsCustomResource_1.AwsCustomResource(this, "Organisation", {
             functionName: "organisationId",
             onCreate: {
                 service: "organizations",
-                action: "describeOrganization",
+                action: "DescribeOrganizationCommand",
                 physicalResourceId: customResources.PhysicalResourceId.of("organisationId")
             },
             onUpdate: {
                 service: "organizations",
-                action: "describeOrganization",
+                action: "DescribeOrganizationCommand",
                 physicalResourceId: customResources.PhysicalResourceId.of("organisationId")
             },
-            resourceType: "Custom::organisationId",
+            resourceType: "Custom::DescribeOrganisation",
             policy: customResources.AwsCustomResourcePolicy.fromStatements([
                 new aws_iam_1.PolicyStatement({
                     actions: ["organizations:DescribeOrganization"],
@@ -29,12 +30,17 @@ class OrganisationId extends aws_cdk_lib_1.Stack {
                 })
             ])
         });
-        new aws_cdk_lib_1.CfnOutput(this, "OrganisationId", {
+        this.organisationId = new aws_cdk_lib_1.CfnOutput(this, "OrganisationId", {
             key: "OrganisationId",
             value: organisation.getResponseField("Organization.Id"),
             exportName: "OrganisationId"
         });
+        this.organisationAccountArn = new aws_cdk_lib_1.CfnOutput(this, "OrganisationAccountId", {
+            key: "OrganisationAccountArn",
+            value: organisation.getResponseField("Organization.MasterAccountArn"),
+            exportName: "OrganisationAccountArn"
+        });
     }
 }
 exports.OrganisationId = OrganisationId;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JnYW5pc2F0aW9uSWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9saWIvY29uZmlnL2F3cy9vcmdhbmlzYXRpb25JZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBK0M7QUFDL0MsZ0VBQWdFO0FBQ2hFLGlEQUE4RDtBQUc5RCx1RkFBb0Y7QUFFcEYsTUFBYSxjQUFlLFNBQVEsbUJBQUs7SUFDdkMsWUFBWSxLQUFnQixFQUFFLEVBQVU7UUFDdEMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQixNQUFNLFlBQVksR0FBRyxJQUFJLHFDQUFpQixDQUFDLElBQUksRUFBRSxtQkFBbUIsRUFBRTtZQUNwRSxZQUFZLEVBQUUsZ0JBQWdCO1lBQzlCLFFBQVEsRUFBRTtnQkFDUixPQUFPLEVBQUUsZUFBZTtnQkFDeEIsTUFBTSxFQUFFLHNCQUFzQjtnQkFDOUIsa0JBQWtCLEVBQ2hCLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7YUFDMUQ7WUFDRCxRQUFRLEVBQUU7Z0JBQ1IsT0FBTyxFQUFFLGVBQWU7Z0JBQ3hCLE1BQU0sRUFBRSxzQkFBc0I7Z0JBQzlCLGtCQUFrQixFQUNoQixlQUFlLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDO2FBQzFEO1lBQ0QsWUFBWSxFQUFFLHdCQUF3QjtZQUN0QyxNQUFNLEVBQUUsZUFBZSxDQUFDLHVCQUF1QixDQUFDLGNBQWMsQ0FBQztnQkFDN0QsSUFBSSx5QkFBZSxDQUFDO29CQUNsQixPQUFPLEVBQUUsQ0FBQyxvQ0FBb0MsQ0FBQztvQkFDL0MsU0FBUyxFQUFFLENBQUMsR0FBRyxDQUFDO29CQUNoQixNQUFNLEVBQUUsZ0JBQU0sQ0FBQyxLQUFLO2lCQUNyQixDQUFDO2FBQ0gsQ0FBQztTQUNILENBQUMsQ0FBQztRQUVILElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLEVBQUU7WUFDcEMsR0FBRyxFQUFFLGdCQUFnQjtZQUNyQixLQUFLLEVBQUUsWUFBWSxDQUFDLGdCQUFnQixDQUFDLGlCQUFpQixDQUFDO1lBQ3ZELFVBQVUsRUFBRSxnQkFBZ0I7U0FDN0IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBbENELHdDQWtDQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENmbk91dHB1dCwgU3RhY2sgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCAqIGFzIGN1c3RvbVJlc291cmNlcyBmcm9tIFwiYXdzLWNkay1saWIvY3VzdG9tLXJlc291cmNlc1wiO1xuaW1wb3J0IHsgRWZmZWN0LCBQb2xpY3lTdGF0ZW1lbnQgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWlhbVwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuaW1wb3J0IHsgQXdzQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiLi4vLi4vcmVzb3VyY2VzL2F3cy91dGlsaXRpZXMvYXdzQ3VzdG9tUmVzb3VyY2VcIjtcblxuZXhwb3J0IGNsYXNzIE9yZ2FuaXNhdGlvbklkIGV4dGVuZHMgU3RhY2sge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIGNvbnN0IG9yZ2FuaXNhdGlvbiA9IG5ldyBBd3NDdXN0b21SZXNvdXJjZSh0aGlzLCBcImlwYW1EZWxlZ2F0ZUFkbWluXCIsIHtcbiAgICAgIGZ1bmN0aW9uTmFtZTogXCJvcmdhbmlzYXRpb25JZFwiLFxuICAgICAgb25DcmVhdGU6IHtcbiAgICAgICAgc2VydmljZTogXCJvcmdhbml6YXRpb25zXCIsXG4gICAgICAgIGFjdGlvbjogXCJkZXNjcmliZU9yZ2FuaXphdGlvblwiLCAvLyBodHRwczovL2RvY3MuYXdzLmFtYXpvbi5jb20vQVdTSmF2YVNjcmlwdFNESy9sYXRlc3QvQVdTL09yZ2FuaXphdGlvbnMuaHRtbCNkZXNjcmliZU9yZ2FuaXphdGlvbi1wcm9wZXJ0eVxuICAgICAgICBwaHlzaWNhbFJlc291cmNlSWQ6XG4gICAgICAgICAgY3VzdG9tUmVzb3VyY2VzLlBoeXNpY2FsUmVzb3VyY2VJZC5vZihcIm9yZ2FuaXNhdGlvbklkXCIpXG4gICAgICB9LFxuICAgICAgb25VcGRhdGU6IHtcbiAgICAgICAgc2VydmljZTogXCJvcmdhbml6YXRpb25zXCIsXG4gICAgICAgIGFjdGlvbjogXCJkZXNjcmliZU9yZ2FuaXphdGlvblwiLCAvLyBodHRwczovL2RvY3MuYXdzLmFtYXpvbi5jb20vQVdTSmF2YVNjcmlwdFNESy9sYXRlc3QvQVdTL09yZ2FuaXphdGlvbnMuaHRtbCNkZXNjcmliZU9yZ2FuaXphdGlvbi1wcm9wZXJ0eVxuICAgICAgICBwaHlzaWNhbFJlc291cmNlSWQ6XG4gICAgICAgICAgY3VzdG9tUmVzb3VyY2VzLlBoeXNpY2FsUmVzb3VyY2VJZC5vZihcIm9yZ2FuaXNhdGlvbklkXCIpXG4gICAgICB9LFxuICAgICAgcmVzb3VyY2VUeXBlOiBcIkN1c3RvbTo6b3JnYW5pc2F0aW9uSWRcIixcbiAgICAgIHBvbGljeTogY3VzdG9tUmVzb3VyY2VzLkF3c0N1c3RvbVJlc291cmNlUG9saWN5LmZyb21TdGF0ZW1lbnRzKFtcbiAgICAgICAgbmV3IFBvbGljeVN0YXRlbWVudCh7XG4gICAgICAgICAgYWN0aW9uczogW1wib3JnYW5pemF0aW9uczpEZXNjcmliZU9yZ2FuaXphdGlvblwiXSxcbiAgICAgICAgICByZXNvdXJjZXM6IFtcIipcIl0sXG4gICAgICAgICAgZWZmZWN0OiBFZmZlY3QuQUxMT1dcbiAgICAgICAgfSlcbiAgICAgIF0pXG4gICAgfSk7XG5cbiAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIFwiT3JnYW5pc2F0aW9uSWRcIiwge1xuICAgICAga2V5OiBcIk9yZ2FuaXNhdGlvbklkXCIsXG4gICAgICB2YWx1ZTogb3JnYW5pc2F0aW9uLmdldFJlc3BvbnNlRmllbGQoXCJPcmdhbml6YXRpb24uSWRcIiksXG4gICAgICBleHBvcnROYW1lOiBcIk9yZ2FuaXNhdGlvbklkXCJcbiAgICB9KTtcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JnYW5pc2F0aW9uSWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9saWIvY29uZmlnL2F3cy9vcmdhbmlzYXRpb25JZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBd0M7QUFDeEMsZ0VBQWdFO0FBQ2hFLGlEQUE4RDtBQUM5RCwyQ0FBdUM7QUFFdkMsdUZBQW9GO0FBRXBGLE1BQWEsY0FBZSxTQUFRLHNCQUFTO0lBSTNDLFlBQVksS0FBZ0IsRUFBRSxFQUFVO1FBQ3RDLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsTUFBTSxZQUFZLEdBQUcsSUFBSSxxQ0FBaUIsQ0FBQyxJQUFJLEVBQUUsY0FBYyxFQUFFO1lBQy9ELFlBQVksRUFBRSxnQkFBZ0I7WUFDOUIsUUFBUSxFQUFFO2dCQUNSLE9BQU8sRUFBRSxlQUFlO2dCQUN4QixNQUFNLEVBQUUsNkJBQTZCO2dCQUNyQyxrQkFBa0IsRUFDaEIsZUFBZSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQzthQUMxRDtZQUNELFFBQVEsRUFBRTtnQkFDUixPQUFPLEVBQUUsZUFBZTtnQkFDeEIsTUFBTSxFQUFFLDZCQUE2QjtnQkFDckMsa0JBQWtCLEVBQ2hCLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7YUFDMUQ7WUFDRCxZQUFZLEVBQUUsOEJBQThCO1lBQzVDLE1BQU0sRUFBRSxlQUFlLENBQUMsdUJBQXVCLENBQUMsY0FBYyxDQUFDO2dCQUM3RCxJQUFJLHlCQUFlLENBQUM7b0JBQ2xCLE9BQU8sRUFBRSxDQUFDLG9DQUFvQyxDQUFDO29CQUMvQyxTQUFTLEVBQUUsQ0FBQyxHQUFHLENBQUM7b0JBQ2hCLE1BQU0sRUFBRSxnQkFBTSxDQUFDLEtBQUs7aUJBQ3JCLENBQUM7YUFDSCxDQUFDO1NBQ0gsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGNBQWMsR0FBRyxJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLGdCQUFnQixFQUFFO1lBQzFELEdBQUcsRUFBRSxnQkFBZ0I7WUFDckIsS0FBSyxFQUFFLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQyxpQkFBaUIsQ0FBQztZQUN2RCxVQUFVLEVBQUUsZ0JBQWdCO1NBQzdCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLHVCQUF1QixFQUFFO1lBQ3pFLEdBQUcsRUFBRSx3QkFBd0I7WUFDN0IsS0FBSyxFQUFFLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQywrQkFBK0IsQ0FBQztZQUNyRSxVQUFVLEVBQUUsd0JBQXdCO1NBQ3JDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQTNDRCx3Q0EyQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDZm5PdXRwdXQgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCAqIGFzIGN1c3RvbVJlc291cmNlcyBmcm9tIFwiYXdzLWNkay1saWIvY3VzdG9tLXJlc291cmNlc1wiO1xuaW1wb3J0IHsgRWZmZWN0LCBQb2xpY3lTdGF0ZW1lbnQgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWlhbVwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuaW1wb3J0IHsgQXdzQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiLi4vLi4vcmVzb3VyY2VzL2F3cy91dGlsaXRpZXMvYXdzQ3VzdG9tUmVzb3VyY2VcIjtcblxuZXhwb3J0IGNsYXNzIE9yZ2FuaXNhdGlvbklkIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IG9yZ2FuaXNhdGlvbklkOiBDZm5PdXRwdXQ7XG4gIHB1YmxpYyByZWFkb25seSBvcmdhbmlzYXRpb25BY2NvdW50QXJuOiBDZm5PdXRwdXQ7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICBjb25zdCBvcmdhbmlzYXRpb24gPSBuZXcgQXdzQ3VzdG9tUmVzb3VyY2UodGhpcywgXCJPcmdhbmlzYXRpb25cIiwge1xuICAgICAgZnVuY3Rpb25OYW1lOiBcIm9yZ2FuaXNhdGlvbklkXCIsXG4gICAgICBvbkNyZWF0ZToge1xuICAgICAgICBzZXJ2aWNlOiBcIm9yZ2FuaXphdGlvbnNcIixcbiAgICAgICAgYWN0aW9uOiBcIkRlc2NyaWJlT3JnYW5pemF0aW9uQ29tbWFuZFwiLCAvLyBodHRwczovL2RvY3MuYXdzLmFtYXpvbi5jb20vQVdTSmF2YVNjcmlwdFNESy9sYXRlc3QvQVdTL09yZ2FuaXphdGlvbnMuaHRtbCNkZXNjcmliZU9yZ2FuaXphdGlvbi1wcm9wZXJ0eVxuICAgICAgICBwaHlzaWNhbFJlc291cmNlSWQ6XG4gICAgICAgICAgY3VzdG9tUmVzb3VyY2VzLlBoeXNpY2FsUmVzb3VyY2VJZC5vZihcIm9yZ2FuaXNhdGlvbklkXCIpXG4gICAgICB9LFxuICAgICAgb25VcGRhdGU6IHtcbiAgICAgICAgc2VydmljZTogXCJvcmdhbml6YXRpb25zXCIsXG4gICAgICAgIGFjdGlvbjogXCJEZXNjcmliZU9yZ2FuaXphdGlvbkNvbW1hbmRcIiwgLy8gaHR0cHM6Ly9kb2NzLmF3cy5hbWF6b24uY29tL0FXU0phdmFTY3JpcHRTREsvbGF0ZXN0L0FXUy9Pcmdhbml6YXRpb25zLmh0bWwjZGVzY3JpYmVPcmdhbml6YXRpb24tcHJvcGVydHlcbiAgICAgICAgcGh5c2ljYWxSZXNvdXJjZUlkOlxuICAgICAgICAgIGN1c3RvbVJlc291cmNlcy5QaHlzaWNhbFJlc291cmNlSWQub2YoXCJvcmdhbmlzYXRpb25JZFwiKVxuICAgICAgfSxcbiAgICAgIHJlc291cmNlVHlwZTogXCJDdXN0b206OkRlc2NyaWJlT3JnYW5pc2F0aW9uXCIsXG4gICAgICBwb2xpY3k6IGN1c3RvbVJlc291cmNlcy5Bd3NDdXN0b21SZXNvdXJjZVBvbGljeS5mcm9tU3RhdGVtZW50cyhbXG4gICAgICAgIG5ldyBQb2xpY3lTdGF0ZW1lbnQoe1xuICAgICAgICAgIGFjdGlvbnM6IFtcIm9yZ2FuaXphdGlvbnM6RGVzY3JpYmVPcmdhbml6YXRpb25cIl0sXG4gICAgICAgICAgcmVzb3VyY2VzOiBbXCIqXCJdLFxuICAgICAgICAgIGVmZmVjdDogRWZmZWN0LkFMTE9XXG4gICAgICAgIH0pXG4gICAgICBdKVxuICAgIH0pO1xuXG4gICAgdGhpcy5vcmdhbmlzYXRpb25JZCA9IG5ldyBDZm5PdXRwdXQodGhpcywgXCJPcmdhbmlzYXRpb25JZFwiLCB7XG4gICAgICBrZXk6IFwiT3JnYW5pc2F0aW9uSWRcIixcbiAgICAgIHZhbHVlOiBvcmdhbmlzYXRpb24uZ2V0UmVzcG9uc2VGaWVsZChcIk9yZ2FuaXphdGlvbi5JZFwiKSxcbiAgICAgIGV4cG9ydE5hbWU6IFwiT3JnYW5pc2F0aW9uSWRcIlxuICAgIH0pO1xuXG4gICAgdGhpcy5vcmdhbmlzYXRpb25BY2NvdW50QXJuID0gbmV3IENmbk91dHB1dCh0aGlzLCBcIk9yZ2FuaXNhdGlvbkFjY291bnRJZFwiLCB7XG4gICAgICBrZXk6IFwiT3JnYW5pc2F0aW9uQWNjb3VudEFyblwiLFxuICAgICAgdmFsdWU6IG9yZ2FuaXNhdGlvbi5nZXRSZXNwb25zZUZpZWxkKFwiT3JnYW5pemF0aW9uLk1hc3RlckFjY291bnRBcm5cIiksXG4gICAgICBleHBvcnROYW1lOiBcIk9yZ2FuaXNhdGlvbkFjY291bnRBcm5cIlxuICAgIH0pO1xuICB9XG59XG4iXX0=

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",
+                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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmFtU2hhcmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9jb25maWcvYXdzL3JhbVNoYXJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsZ0VBQWdFO0FBQ2hFLGlEQUFzRDtBQUN0RCwyQ0FBdUM7QUFFdkMsdUZBQW9GO0FBRXBGLE1BQWEsVUFBVyxTQUFRLHNCQUFTO0lBQ3ZDLFlBQVksS0FBZ0IsRUFBRSxFQUFVO1FBQ3RDLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxxQ0FBaUIsQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLEVBQUU7WUFDOUMsWUFBWSxFQUFFLGtCQUFrQjtZQUNoQyxRQUFRLEVBQUU7Z0JBQ1IsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsTUFBTSxFQUFFLGtDQUFrQztnQkFDMUMsVUFBVSxFQUFFLEVBQUU7Z0JBQ2Qsa0JBQWtCLEVBQ2hCLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsa0JBQWtCLENBQUM7YUFDNUQ7WUFDRCxZQUFZLEVBQUUsYUFBYTtZQUMzQixNQUFNLEVBQUUsZUFBZSxDQUFDLHVCQUF1QixDQUFDLGNBQWMsQ0FBQztnQkFDN0QsSUFBSSx5QkFBZSxDQUFDO29CQUNsQixPQUFPLEVBQUU7d0JBQ1Asc0NBQXNDO3dCQUN0Qyw2QkFBNkI7d0JBQzdCLHNDQUFzQzt3QkFDdEMsb0NBQW9DO3FCQUNyQztvQkFDRCxTQUFTLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyw2Q0FBNkM7aUJBQy9ELENBQUM7YUFDSCxDQUFDO1NBQ0gsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBM0JELGdDQTJCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIGN1c3RvbVJlc291cmNlcyBmcm9tIFwiYXdzLWNkay1saWIvY3VzdG9tLXJlc291cmNlc1wiO1xuaW1wb3J0IHsgUG9saWN5U3RhdGVtZW50IH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1pYW1cIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmltcG9ydCB7IEF3c0N1c3RvbVJlc291cmNlIH0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvdXRpbGl0aWVzL2F3c0N1c3RvbVJlc291cmNlXCI7XG5cbmV4cG9ydCBjbGFzcyBSYW1TaGFyaW5nIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICBuZXcgQXdzQ3VzdG9tUmVzb3VyY2UodGhpcywgXCJlbmFibGVSYW1TaGFyaW5nXCIsIHtcbiAgICAgIGZ1bmN0aW9uTmFtZTogXCJlbmFibGVSYW1TaGFyaW5nXCIsXG4gICAgICBvbkNyZWF0ZToge1xuICAgICAgICBzZXJ2aWNlOiBcIlJBTVwiLFxuICAgICAgICBhY3Rpb246IFwiZW5hYmxlU2hhcmluZ1dpdGhBd3NPcmdhbml6YXRpb25cIiwgLy8gaHR0cHM6Ly9kb2NzLmF3cy5hbWF6b24uY29tL0FXU0phdmFTY3JpcHRTREsvbGF0ZXN0L0FXUy9SQU0uaHRtbCNlbmFibGVTaGFyaW5nV2l0aEF3c09yZ2FuaXphdGlvbi1wcm9wZXJ0eVxuICAgICAgICBwYXJhbWV0ZXJzOiB7fSxcbiAgICAgICAgcGh5c2ljYWxSZXNvdXJjZUlkOlxuICAgICAgICAgIGN1c3RvbVJlc291cmNlcy5QaHlzaWNhbFJlc291cmNlSWQub2YoXCJlbmFibGVSYW1TaGFyaW5nXCIpXG4gICAgICB9LFxuICAgICAgcmVzb3VyY2VUeXBlOiBcIkN1c3RvbTo6cmFtXCIsXG4gICAgICBwb2xpY3k6IGN1c3RvbVJlc291cmNlcy5Bd3NDdXN0b21SZXNvdXJjZVBvbGljeS5mcm9tU3RhdGVtZW50cyhbXG4gICAgICAgIG5ldyBQb2xpY3lTdGF0ZW1lbnQoe1xuICAgICAgICAgIGFjdGlvbnM6IFtcbiAgICAgICAgICAgIFwicmFtOkVuYWJsZVNoYXJpbmdXaXRoQXdzT3JnYW5pemF0aW9uXCIsXG4gICAgICAgICAgICBcImlhbTpDcmVhdGVTZXJ2aWNlTGlua2VkUm9sZVwiLFxuICAgICAgICAgICAgXCJvcmdhbml6YXRpb25zOmVuYWJsZUFXU1NlcnZpY2VBY2Nlc3NcIixcbiAgICAgICAgICAgIFwib3JnYW5pemF0aW9uczpEZXNjcmliZU9yZ2FuaXphdGlvblwiXG4gICAgICAgICAgXSxcbiAgICAgICAgICByZXNvdXJjZXM6IFtcIipcIl0gLy8gVE9ETzogRmluZCBvdXQgdGhlIGV4YWN0IHByaWNpcGFsIGZvciB0aGlzXG4gICAgICAgIH0pXG4gICAgICBdKVxuICAgIH0pO1xuICB9XG59XG4iXX0=

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

@@ -1,7 +1,7 @@
 import { AwsStackProps } from "../../resources/aws/awsStack";
-import { KeyValue } from "../../resources/aws/compute/ecs";
 import { ScalingType, Protocol } from "../../resources/aws/compute/ecs";
 import { IManagedPolicy, PolicyDocument } from "aws-cdk-lib/aws-iam";
+import { KeyValue } from "../../types";
 /**
  * Intersected with BasicAppProps in the getProps method. This allows the BasicApp construct
  * to treat these as required properties and avoid constant null checking.
@@ -15,15 +15,16 @@ export interface BasicAppPropDefaults {
     containerPort: number;
 }
 export interface BasicAppProps {
-    account?: string;
+    accountId?: string;
     clusterName?: string;
     containerCommand?: string[];
     containerEnvironment?: KeyValue;
     containerPort?: number;
     containerSecrets?: string[];
+    environment: string;
     owner?: string;
     parentDomain?: string;
-    environment: string;
+    accountName: string;
     listenerPort?: number;
     protocol?: Protocol;
     region?: string;
@@ -32,7 +33,7 @@ export interface BasicAppProps {
     taskRoleInlinePolicies?: {
         [name: string]: PolicyDocument;
     };
-    taskRoleManagegedPolicies?: IManagedPolicy[];
+    taskRoleManagedPolicies?: IManagedPolicy[];
     tags?: KeyValue;
 }
 export declare class BasicApp {

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

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicApp = void 0;
 const awsStack_1 = require("../../resources/aws/awsStack");
-const vpc_1 = require("../../resources/aws/constant/vpc");
-const ecr_1 = require("../../resources/aws/constant/ecr");
+const vpc_1 = require("../../resources/aws/networking/vpc");
 const ecs_1 = require("../../resources/aws/compute/ecs");
-const database_1 = require("../../resources/aws/store/database");
-const ecs_2 = require("../../resources/aws/compute/ecs");
-const secret_1 = require("../../resources/aws/store/secret");
+const database_1 = require("../../resources/aws/database/database");
+const secrets_1 = require("../../resources/aws/secrets");
+const storage_1 = require("../../resources/aws/storage");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 class BasicApp {
     constructor(id, rawProps) {
@@ -15,10 +14,11 @@ class BasicApp {
         const stackProps = this.getStackProps(props);
         this.vpcStack = new awsStack_1.default(`${id}Network`, [], stackProps)
             .addNetwork(vpc_1.Vpc.build(`${id}Vpc`, {
-            environment: props.environment,
+            accountName: props.accountName,
+            region: props.region,
             tags: props.tags
         }))
-            .addContainerRegistry(ecr_1.default.build(`${id}Ecr`));
+            .addContainerRegistry(storage_1.Ecr.build(`${id}Ecr`));
         this.databaseStack = new awsStack_1.default(`${id}Database`, this.vpcStack, stackProps)
             .addNetwork(this.vpcStack.getNetwork())
             .addResource(database_1.default.build(`${id}Database`));
@@ -30,7 +30,7 @@ class BasicApp {
                 secretObjectValue[secretObject] = aws_cdk_lib_1.SecretValue.unsafePlainText("");
             }
         }
-        this.secretStack = new awsStack_1.default(`${id}Secret`, [], stackProps).addResource(secret_1.default.build(`${id}Secret`, {
+        this.secretStack = new awsStack_1.default(`${id}Secret`, [], stackProps).addResource(secrets_1.Secret.build(`${id}Secret`, {
             secretName: `/${props.clusterName}/${props.serviceName}`,
             secretObjectValue: secretObjectValue,
             tags: props.tags
@@ -40,19 +40,19 @@ class BasicApp {
             .addResource(ecs_1.default.build(`${id}Fargate`, {
             clusterName: props.clusterName,
             protocol: props.protocol,
-            //TODO: This should work via line 110, but doesn't work (at least on update)
+            //TODO: This should work via line 126, but doesn't work (at least on update)
             databaseConnection: dbResource.connections,
             containerCommand: props.containerCommand,
             containerEnvironment: props.containerEnvironment,
             containerPort: props.containerPort,
             containerSecrets: secretObjectValue,
             ecrRepository: this.vpcStack.getContainerRegistry(),
-            parentDomain: props.parentDomain,
+            parentDomain: props.parentDomain?.toLowerCase(),
             listenerPort: props.listenerPort,
             scalingType: props.scalingType,
             serviceName: props.serviceName,
             taskRoleInlinePolicies: props.taskRoleInlinePolicies,
-            taskRoleManagegedPolicies: props.taskRoleManagegedPolicies,
+            taskRoleManagedPolicies: props.taskRoleManagedPolicies,
             tags: props.tags
         }))
             .connect(`${id}Fargate`, `${id}Database`, 5432);
@@ -61,20 +61,20 @@ class BasicApp {
         if (!props)
             return;
         return {
-            account: props.account,
+            accountId: props.accountId,
             region: props.region,
-            environment: props.environment
+            accountName: props.accountName
         };
     }
     getProps(id, rawProps) {
         const defaultProps = {
             tags: {
                 "fjall:costAllocation:service": "app",
-                "fjall:costAllocation:environment": rawProps.environment || 'production',
-                "fjall:costAllocation:owner": rawProps.owner || 'Engineer'
+                "fjall:costAllocation:environment": rawProps.environment || "production",
+                "fjall:costAllocation:owner": rawProps.owner || "engineer"
             },
-            scalingType: ecs_2.ScalingType.CPU,
-            protocol: rawProps.parentDomain ? ecs_2.Protocol.HTTPS : ecs_2.Protocol.HTTP,
+            scalingType: ecs_1.ScalingType.CPU,
+            protocol: rawProps.parentDomain ? ecs_1.Protocol.HTTPS : ecs_1.Protocol.HTTP,
             containerPort: 3000,
             serviceName: `${id}Service`,
             clusterName: `${id}Cluster`
@@ -87,4 +87,4 @@ class BasicApp {
 }
 exports.BasicApp = BasicApp;
 exports.default = BasicApp;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"basicApp.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/basicApp.ts"],"names":[],"mappings":"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","sourcesContent":["import AwsStack, { AwsStackProps } from \"../../resources/aws/awsStack\";\nimport { Vpc } from \"../../resources/aws/constant/vpc\";\nimport Ecr from \"../../resources/aws/constant/ecr\";\nimport Fargate, {\n  ContainerSecret,\n  KeyValue\n} from \"../../resources/aws/compute/ecs\";\nimport Database from \"../../resources/aws/store/database\";\nimport { ScalingType, Protocol } from \"../../resources/aws/compute/ecs\";\nimport Secret from \"../../resources/aws/store/secret\";\nimport { SecretValue } from \"aws-cdk-lib\";\nimport { IManagedPolicy, PolicyDocument } from \"aws-cdk-lib/aws-iam\";\n\n\n/**\n * Intersected with BasicAppProps in the getProps method. This allows the BasicApp construct\n * to treat these as required properties and avoid constant null checking.\n */\nexport interface BasicAppPropDefaults {\n  tags: KeyValue;\n  serviceName: string;\n  clusterName: string;\n  protocol: Protocol;\n  scalingType: ScalingType;\n  containerPort: number;\n}\n\nexport interface BasicAppProps {\n  account?: string;\n  clusterName?: string;\n  containerCommand?: string[];\n  containerEnvironment?: KeyValue;\n  containerPort?: number;\n  containerSecrets?: string[];\n  // The team/domain/business-unit that is responsible for this service\n  owner?: string\n  parentDomain?: string; // Fix to make a dependancy of protocol\n  environment: string;\n  listenerPort?: number;\n  protocol?: Protocol;\n  region?: string;\n  scalingType?: ScalingType;\n  serviceName?: string;\n  taskRoleInlinePolicies?: {\n    [name: string]: PolicyDocument;\n  };\n  taskRoleManagegedPolicies?: IManagedPolicy[];\n  tags?: KeyValue;\n}\n\nexport class BasicApp {\n  private vpcStack: AwsStack;\n  private databaseStack: AwsStack;\n  private secretStack: AwsStack;\n  private computeStack: AwsStack;\n\n  constructor(id: string, rawProps: BasicAppProps) {\n    const props = this.getProps(id, rawProps);\n    const stackProps = this.getStackProps(props);\n\n    this.vpcStack = new AwsStack(`${id}Network`, [], stackProps)\n      .addNetwork(\n        Vpc.build(`${id}Vpc`, {\n          environment: props.environment,\n          tags: props.tags\n        })\n      )\n      .addContainerRegistry(Ecr.build(`${id}Ecr`));\n\n    this.databaseStack = new AwsStack(\n      `${id}Database`,\n      this.vpcStack,\n      stackProps\n    )\n      .addNetwork(this.vpcStack.getNetwork())\n      .addResource(Database.build(`${id}Database`));\n\n    //TODO: validate id does not contain special characters (no hyphens - no slashes etc) database instances won't allow it\n\n    const dbResource = this.databaseStack.getResource(\n      `${id}Database`\n    ) as Database;\n\n    const secretObjectValue: ContainerSecret = {};\n    if (props.containerSecrets) {\n      for (const secretObject of props.containerSecrets) {\n        secretObjectValue[secretObject] = SecretValue.unsafePlainText(\"\");\n      }\n    }\n\n    this.secretStack = new AwsStack(\n      `${id}Secret`,\n      [],\n      stackProps\n    ).addResource(\n      Secret.build(`${id}Secret`, {\n        secretName: `/${props.clusterName}/${props.serviceName}`,\n        secretObjectValue: secretObjectValue,\n        tags: props.tags\n      })\n    );\n\n    this.computeStack = new AwsStack(\n      `${id}Compute`,\n      [this.vpcStack, this.databaseStack, this.secretStack],\n      stackProps\n    )\n      .addNetwork(this.vpcStack.getNetwork())\n      .addResource(\n        Fargate.build(`${id}Fargate`, {\n          clusterName: props.clusterName,\n          protocol: props.protocol,\n          //TODO: This should work via line 110, but doesn't work (at least on update)\n          databaseConnection: dbResource.connections,\n          containerCommand: props.containerCommand,\n          containerEnvironment: props.containerEnvironment,\n          containerPort: props.containerPort,\n          containerSecrets: secretObjectValue,\n          ecrRepository: this.vpcStack.getContainerRegistry(),\n          parentDomain: props.parentDomain,\n          listenerPort: props.listenerPort,\n          scalingType: props.scalingType,\n          serviceName: props.serviceName,\n          taskRoleInlinePolicies: props.taskRoleInlinePolicies,\n          taskRoleManagegedPolicies: props.taskRoleManagegedPolicies,\n          tags: props.tags\n        })\n      )\n      .connect(`${id}Fargate`, `${id}Database`, 5432);\n  }\n\n  getStackProps(props: BasicAppProps): AwsStackProps | undefined {\n    if (!props) return;\n\n    return {\n      account: props.account,\n      region: props.region,\n      environment: props.environment\n    };\n  }\n\n  getProps(id: string, rawProps: BasicAppProps): BasicAppProps & BasicAppPropDefaults {\n\n    const defaultProps = {\n      tags: {\n        \"fjall:costAllocation:service\": \"app\",\n        \"fjall:costAllocation:environment\": rawProps.environment || 'production',\n        \"fjall:costAllocation:owner\": rawProps.owner || 'Engineer'\n      },\n      scalingType: ScalingType.CPU,\n      protocol: rawProps.parentDomain ? Protocol.HTTPS : Protocol.HTTP,\n      containerPort: 3000,\n      serviceName: `${id}Service`,\n      clusterName: `${id}Cluster`\n    };\n\n    return {\n      ...defaultProps,\n      ...rawProps\n    }\n  }\n}\nexport default BasicApp;\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"basicApp.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/basicApp.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,4DAAyD;AACzD,yDAIyC;AACzC,oEAA6D;AAC7D,yDAAqD;AACrD,yDAAkD;AAClD,6CAA0C;AAyC1C,MAAa,QAAQ;IAMnB,YAAY,EAAU,EAAE,QAAuB;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,CAAC;aACzD,UAAU,CACT,SAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE;YACpB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CACH;aACA,oBAAoB,CAAC,aAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAE/C,IAAI,CAAC,aAAa,GAAG,IAAI,kBAAQ,CAC/B,GAAG,EAAE,UAAU,EACf,IAAI,CAAC,QAAQ,EACb,UAAU,CACX;aACE,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;aACtC,WAAW,CAAC,kBAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;QAEhD,uHAAuH;QAEvH,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAC/C,GAAG,EAAE,UAAU,CACJ,CAAC;QAEd,MAAM,iBAAiB,GAAoB,EAAE,CAAC;QAC9C,IAAI,KAAK,CAAC,gBAAgB,EAAE;YAC1B,KAAK,MAAM,YAAY,IAAI,KAAK,CAAC,gBAAgB,EAAE;gBACjD,iBAAiB,CAAC,YAAY,CAAC,GAAG,yBAAW,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;aACnE;SACF;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC,WAAW,CACxE,gBAAM,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE;YAC1B,UAAU,EAAE,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,EAAE;YACxD,iBAAiB,EAAE,iBAAiB;YACpC,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,YAAY,GAAG,IAAI,kBAAQ,CAC9B,GAAG,EAAE,SAAS,EACd,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,EACrD,UAAU,CACX;aACE,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;aACtC,WAAW,CACV,aAAO,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE;YAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,4EAA4E;YAC5E,kBAAkB,EAAE,UAAU,CAAC,WAAW;YAC1C,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;YAChD,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,gBAAgB,EAAE,iBAAiB;YACnC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE;YACnD,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,WAAW,EAAE;YAC/C,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;YACpD,uBAAuB,EAAE,KAAK,CAAC,uBAAuB;YACtD,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CACH;aACA,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,aAAa,CAAC,KAAoB;QAChC,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,OAAO;YACL,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;IAED,QAAQ,CACN,EAAU,EACV,QAAuB;QAEvB,MAAM,YAAY,GAAG;YACnB,IAAI,EAAE;gBACJ,8BAA8B,EAAE,KAAK;gBACrC,kCAAkC,EAChC,QAAQ,CAAC,WAAW,IAAI,YAAY;gBACtC,4BAA4B,EAAE,QAAQ,CAAC,KAAK,IAAI,UAAU;aAC3D;YACD,WAAW,EAAE,iBAAW,CAAC,GAAG;YAC5B,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,cAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,cAAQ,CAAC,IAAI;YAChE,aAAa,EAAE,IAAI;YACnB,WAAW,EAAE,GAAG,EAAE,SAAS;YAC3B,WAAW,EAAE,GAAG,EAAE,SAAS;SAC5B,CAAC;QAEF,OAAO;YACL,GAAG,YAAY;YACf,GAAG,QAAQ;SACZ,CAAC;IACJ,CAAC;CACF;AA/GD,4BA+GC;AACD,kBAAe,QAAQ,CAAC","sourcesContent":["import AwsStack, { AwsStackProps } from \"../../resources/aws/awsStack\";\nimport { Vpc } from \"../../resources/aws/networking/vpc\";\nimport Fargate, {\n  ContainerSecret,\n  ScalingType,\n  Protocol\n} from \"../../resources/aws/compute/ecs\";\nimport Database from \"../../resources/aws/database/database\";\nimport { Secret } from \"../../resources/aws/secrets\";\nimport { Ecr } from \"../../resources/aws/storage\";\nimport { SecretValue } from \"aws-cdk-lib\";\nimport { IManagedPolicy, PolicyDocument } from \"aws-cdk-lib/aws-iam\";\nimport { KeyValue } from \"../../types\";\n\n/**\n * Intersected with BasicAppProps in the getProps method. This allows the BasicApp construct\n * to treat these as required properties and avoid constant null checking.\n */\nexport interface BasicAppPropDefaults {\n  tags: KeyValue;\n  serviceName: string;\n  clusterName: string;\n  protocol: Protocol;\n  scalingType: ScalingType;\n  containerPort: number;\n}\n\nexport interface BasicAppProps {\n  accountId?: string;\n  clusterName?: string;\n  containerCommand?: string[];\n  containerEnvironment?: KeyValue;\n  containerPort?: number;\n  containerSecrets?: string[];\n  environment: string;\n  // The team/domain/business-unit that is responsible for this service\n  owner?: string;\n  parentDomain?: string; // Fix to make a dependency of protocol\n  accountName: string;\n  listenerPort?: number;\n  protocol?: Protocol;\n  region?: string;\n  scalingType?: ScalingType;\n  serviceName?: string;\n  taskRoleInlinePolicies?: {\n    [name: string]: PolicyDocument;\n  };\n  taskRoleManagedPolicies?: IManagedPolicy[];\n  tags?: KeyValue;\n}\n\nexport class BasicApp {\n  private vpcStack: AwsStack;\n  private databaseStack: AwsStack;\n  private secretStack: AwsStack;\n  private computeStack: AwsStack;\n\n  constructor(id: string, rawProps: BasicAppProps) {\n    const props = this.getProps(id, rawProps);\n    const stackProps = this.getStackProps(props);\n\n    this.vpcStack = new AwsStack(`${id}Network`, [], stackProps)\n      .addNetwork(\n        Vpc.build(`${id}Vpc`, {\n          accountName: props.accountName,\n          region: props.region,\n          tags: props.tags\n        })\n      )\n      .addContainerRegistry(Ecr.build(`${id}Ecr`));\n\n    this.databaseStack = new AwsStack(\n      `${id}Database`,\n      this.vpcStack,\n      stackProps\n    )\n      .addNetwork(this.vpcStack.getNetwork())\n      .addResource(Database.build(`${id}Database`));\n\n    //TODO: validate id does not contain special characters (no hyphens - no slashes etc) database instances won't allow it\n\n    const dbResource = this.databaseStack.getResource(\n      `${id}Database`\n    ) as Database;\n\n    const secretObjectValue: ContainerSecret = {};\n    if (props.containerSecrets) {\n      for (const secretObject of props.containerSecrets) {\n        secretObjectValue[secretObject] = SecretValue.unsafePlainText(\"\");\n      }\n    }\n\n    this.secretStack = new AwsStack(`${id}Secret`, [], stackProps).addResource(\n      Secret.build(`${id}Secret`, {\n        secretName: `/${props.clusterName}/${props.serviceName}`,\n        secretObjectValue: secretObjectValue,\n        tags: props.tags\n      })\n    );\n\n    this.computeStack = new AwsStack(\n      `${id}Compute`,\n      [this.vpcStack, this.databaseStack, this.secretStack],\n      stackProps\n    )\n      .addNetwork(this.vpcStack.getNetwork())\n      .addResource(\n        Fargate.build(`${id}Fargate`, {\n          clusterName: props.clusterName,\n          protocol: props.protocol,\n          //TODO: This should work via line 126, but doesn't work (at least on update)\n          databaseConnection: dbResource.connections,\n          containerCommand: props.containerCommand,\n          containerEnvironment: props.containerEnvironment,\n          containerPort: props.containerPort,\n          containerSecrets: secretObjectValue,\n          ecrRepository: this.vpcStack.getContainerRegistry(),\n          parentDomain: props.parentDomain?.toLowerCase(),\n          listenerPort: props.listenerPort,\n          scalingType: props.scalingType,\n          serviceName: props.serviceName,\n          taskRoleInlinePolicies: props.taskRoleInlinePolicies,\n          taskRoleManagedPolicies: props.taskRoleManagedPolicies,\n          tags: props.tags\n        })\n      )\n      .connect(`${id}Fargate`, `${id}Database`, 5432);\n  }\n\n  getStackProps(props: BasicAppProps): AwsStackProps | undefined {\n    if (!props) return;\n\n    return {\n      accountId: props.accountId,\n      region: props.region,\n      accountName: props.accountName\n    };\n  }\n\n  getProps(\n    id: string,\n    rawProps: BasicAppProps\n  ): BasicAppProps & BasicAppPropDefaults {\n    const defaultProps = {\n      tags: {\n        \"fjall:costAllocation:service\": \"app\",\n        \"fjall:costAllocation:environment\":\n          rawProps.environment || \"production\",\n        \"fjall:costAllocation:owner\": rawProps.owner || \"engineer\"\n      },\n      scalingType: ScalingType.CPU,\n      protocol: rawProps.parentDomain ? Protocol.HTTPS : Protocol.HTTP,\n      containerPort: 3000,\n      serviceName: `${id}Service`,\n      clusterName: `${id}Cluster`\n    };\n\n    return {\n      ...defaultProps,\n      ...rawProps\n    };\n  }\n}\nexport default BasicApp;\n"]}

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

@@ -1,50 +1,59 @@
 import { StackProps, Stack } from "aws-cdk-lib";
 import { InstanceType } from "aws-cdk-lib/aws-ec2";
 import { Construct } from "constructs";
-import { KeyValue } from "../../resources/aws/compute/ecs";
+import { KeyValue } from "../../types";
 declare enum agentRelease {
     STABLE = "stable",
     BETA = "beta",
     EDGE = "edge"
 }
 export interface BuildkiteProps extends StackProps {
-    environment: string;
+    accountName: string;
     elasticStackVersion: string;
-    agentScalerVersion: string;
-    queueName: string;
-    spotCapacityPercentage: number;
+    keyName: string;
+    buildkiteAgentRelease: agentRelease;
+    buildkiteAgentTags: string;
+    buildkiteAgentTimestampLines: boolean;
+    buildkiteAgentExperiments: string;
+    buildkiteAgentScalerVersion: string;
+    logRetentionDays: number;
+    buildkiteAgentTracingBackend: "" | "datadog" | "opentelemetry";
+    buildkiteAgentCancelGracePeriod: number;
+    buildkiteTerminateInstanceAfterJob: boolean;
+    buildkiteAdditionalSudoPermissions: string;
+    buildkiteQueue: string;
+    agentsPerInstance: number;
+    bootstrapScriptUrl: string;
+    agentEnvFileUrl: string;
+    authorizedUsersUrl: string;
     agentInstanceType: InstanceType;
     agentVolumeSize: number;
     agentMinInstances: number;
     agentMaxInstances: number;
-    instanceStorage: boolean;
-    dockerUserNamespaceRemap: boolean;
-    dockerExperimental: boolean;
-    scaleInPeriod: number;
-    agentsPerInstance: number;
-    agentTags: string;
-    timestampLines: boolean;
-    experiments: string;
-    tracingBackend: string;
-    agentRelease: agentRelease;
-    gitMirrors: boolean;
-    bootstrapScript: string;
-    envFileUrl: string;
-    authorizedUsersUrl: string;
-    ecrAccessPolicy: string;
-    instanceTerminationAfterJob: boolean;
-    sudoPermissions: string;
-    tags: KeyValue;
-    secretsPluginEnabled: boolean;
-    ecrPluginEnabled: boolean;
-    dockerLoginPluginEnabled: boolean;
+    scalerEventSchedulePeriod: string;
+    scalerMinPollInterval: string;
+    spotCapacityPercentage: number;
     scaleOutFactor: string;
+    ecrAccessPolicy: string;
+    scaleInIdlePeriod: number;
     scaleOutWaitingForJobs: boolean;
-    eventScheduledPeriod: string;
-    minPollInterval: string;
+    dockerNetworkingProtocol: "ipv4" | "dualstack";
+    enableSecretsPlugin: boolean;
+    enableEcrPlugin: boolean;
+    enableDockerLoginPlugin: boolean;
+    enableDockerUserNamespaceRemap: boolean;
+    enableDockerExperimental: boolean;
+    enableInstanceStorage: boolean;
+    mountTmpfsAtTmp: boolean;
+    buildkiteAgentEnableGitMirrors: boolean;
+    pipelineSigningKMSKey: string;
+    pipelineSigningVerificationFailureBehavior: "block" | "warn";
+    tags: KeyValue;
+    environment: string;
+    owner?: string;
 }
-export declare const BuildkiteDefaultProps: Pick<BuildkiteProps, "elasticStackVersion" | "agentScalerVersion" | "spotCapacityPercentage" | "agentInstanceType" | "agentVolumeSize" | "agentMinInstances" | "agentMaxInstances" | "instanceStorage" | "dockerUserNamespaceRemap" | "dockerExperimental" | "scaleInPeriod" | "agentsPerInstance" | "agentTags" | "timestampLines" | "experiments" | "tracingBackend" | "agentRelease" | "gitMirrors" | "bootstrapScript" | "envFileUrl" | "authorizedUsersUrl" | "ecrAccessPolicy" | "instanceTerminationAfterJob" | "sudoPermissions" | "secretsPluginEnabled" | "ecrPluginEnabled" | "dockerLoginPluginEnabled" | "scaleOutFactor" | "scaleOutWaitingForJobs" | "eventScheduledPeriod" | "minPollInterval">;
-export default class Buildkite extends Stack {
+export declare const BuildkiteDefaultProps: Pick<BuildkiteProps, "elasticStackVersion" | "keyName" | "buildkiteAgentRelease" | "buildkiteAgentTags" | "buildkiteAgentTimestampLines" | "buildkiteAgentExperiments" | "buildkiteAgentScalerVersion" | "logRetentionDays" | "buildkiteAgentTracingBackend" | "buildkiteAgentCancelGracePeriod" | "buildkiteTerminateInstanceAfterJob" | "buildkiteAdditionalSudoPermissions" | "buildkiteQueue" | "agentsPerInstance" | "bootstrapScriptUrl" | "agentEnvFileUrl" | "authorizedUsersUrl" | "agentInstanceType" | "agentVolumeSize" | "agentMinInstances" | "agentMaxInstances" | "scalerEventSchedulePeriod" | "scalerMinPollInterval" | "spotCapacityPercentage" | "scaleOutFactor" | "scaleInIdlePeriod" | "scaleOutWaitingForJobs" | "ecrAccessPolicy" | "dockerNetworkingProtocol" | "enableSecretsPlugin" | "enableEcrPlugin" | "enableDockerLoginPlugin" | "enableDockerUserNamespaceRemap" | "enableDockerExperimental" | "enableInstanceStorage" | "mountTmpfsAtTmp" | "buildkiteAgentEnableGitMirrors" | "pipelineSigningKMSKey" | "pipelineSigningVerificationFailureBehavior" | "environment" | "owner">;
+export declare class Buildkite extends Stack {
     constructor(scope: Construct, id: string, props: BuildkiteProps);
 }
-export {};
+export default Buildkite;