@fjall/components-infrastructure 0.29.4 → 0.31.1

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

@@ -8,7 +8,9 @@ interface OrganisationProps extends StackProps {
     orgEmail: string;
     existingAccounts?: ExistingAccounts[];
 }
-type AccountsConfig = Record<string, string | string[] | readonly string[]>;
+type AccountsConfig = {
+    readonly [key: string]: readonly string[] | string;
+};
 /**
  * A construct for creating multi environment organisations with a production, staging and development account.
  */

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

@@ -4,7 +4,7 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
 const constructs_1 = require("constructs");
 const aws_cdk_lib_2 = require("aws-cdk-lib");
 const stripAndCamelCase_1 = require("../../utils/stripAndCamelCase");
-const organisations_1 = require("../../resources/aws/organisations");
+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.
@@ -19,16 +19,16 @@ class Organisation extends constructs_1.Construct {
         this.addOrganisationUnitsAndAccounts(props.accounts, props.orgEmail);
     }
     addOrganisation(organisationName) {
-        this.organisation = new organisations_1.Organisation(this, organisationName, {
-            featureSet: organisations_1.FeatureSet.ALL
+        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 = [
-            organisations_1.PolicyType.SERVICE_CONTROL_POLICY,
-            organisations_1.PolicyType.TAG_POLICY,
-            organisations_1.PolicyType.BACKUP_POLICY,
-            organisations_1.PolicyType.AISERVICES_OPT_OUT_POLICY
+            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);
@@ -38,17 +38,13 @@ class Organisation extends constructs_1.Construct {
         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}OrganisationalUnit`, ouName);
+            const orgUnit = this.addOrganisationalUnit(`${ouName}OrganizationalUnit`, ouName);
             // Convert single account to array for uniform processing
             const accountsArray = Array.isArray(accountList)
-                ? [...accountList] // Convert readonly array to mutable array
+                ? accountList
                 : [accountList];
             // Add accounts to this OU
             for (const accountName of accountsArray) {
-                // Ensure accountName is a string (it should be after array conversion)
-                if (typeof accountName !== "string") {
-                    continue; // Skip if somehow it's not a string
-                }
                 const accountNameId = (0, stripAndCamelCase_1.stripAndCamelCase)(accountName);
                 const importedAccount = this.existingAccounts?.find((account) => account.Name === accountName);
                 const accountEmail = importedAccount
@@ -61,8 +57,8 @@ class Organisation extends constructs_1.Construct {
         }
     }
     addOrganisationalUnit(id, name) {
-        const ou = new organisations_1.OrganisationalUnit(this, id, {
-            organisationalUnitName: name,
+        const ou = new cdk_organizations_1.OrganizationalUnit(this, id, {
+            organizationalUnitName: name,
             parent: this.organisation.root,
             importOnDuplicate: true
         });
@@ -70,7 +66,7 @@ class Organisation extends constructs_1.Construct {
         return ou;
     }
     addAccount(id, name, email, tags, organisationalUnit) {
-        const acc = new organisations_1.Account(this, id, {
+        const acc = new cdk_organizations_1.Account(this, id, {
             accountName: name,
             email: email,
             parent: organisationalUnit,
@@ -97,4 +93,4 @@ class Organisation extends constructs_1.Construct {
     }
 }
 exports.default = Organisation;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"organisation.js","sourceRoot":"","sources":["../../../../lib/config/aws/organisation.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, StackProps } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { Tags } from \"aws-cdk-lib\";\nimport { stripAndCamelCase } from \"../../utils/stripAndCamelCase\";\nimport { Account as ExistingAccounts } from \"@aws-sdk/client-organizations\";\nimport {\n  Account,\n  FeatureSet,\n  Organisation as FjallOrganisation,\n  OrganisationalUnit,\n  PolicyType\n} from \"../../resources/aws/organisations\";\nimport addSuffixToEmail from \"../../utils/addSuffixToEmail\";\nimport { KeyValue } from \"../../types\";\n\ninterface OrganisationProps extends StackProps {\n  organisationName: string;\n  accounts: AccountsConfig;\n  orgEmail: string;\n  existingAccounts?: ExistingAccounts[];\n}\n\ntype AccountsConfig = Record<string, string | string[] | readonly string[]>;\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: FjallOrganisation;\n  private organisationalUnits: OrganisationalUnit[] = [];\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 FjallOrganisation(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}OrganisationalUnit`,\n        ouName\n      );\n\n      // Convert single account to array for uniform processing\n      const accountsArray = Array.isArray(accountList)\n        ? [...accountList] // Convert readonly array to mutable array\n        : [accountList];\n\n      // Add accounts to this OU\n      for (const accountName of accountsArray) {\n        // Ensure accountName is a string (it should be after array conversion)\n        if (typeof accountName !== \"string\") {\n          continue; // Skip if somehow it's not a string\n        }\n\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): OrganisationalUnit {\n    const ou = new OrganisationalUnit(this, id, {\n      organisationalUnitName: 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: OrganisationalUnit\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(): KeyValue {\n    return this.accounts;\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"organisation.js","sourceRoot":"","sources":["../../../../lib/config/aws/organisation.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, StackProps } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { Tags } from \"aws-cdk-lib\";\nimport { stripAndCamelCase } from \"../../utils/stripAndCamelCase\";\nimport { 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 { 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/components-infrastructure",
-  "version": "0.29.4",
+  "version": "0.31.1",
   "bin": {
     "infrastructure": "bin/infrastructure.js"
   },
@@ -35,7 +35,8 @@
   "dependencies": {
     "@aws-sdk/client-cost-explorer": "^3.717.0",
     "@aws-sdk/client-organizations": "^3.716.0",
-    "@fjall/util": "^0.29.4",
+    "@fjall/util": "^0.31.1",
+    "@pepperize/cdk-organizations": "^0.7.135",
     "aws-lambda": "^1.0.7",
     "cdk-time-sleep": "^1.0.0",
     "constructs": "^10.0.0",
@@ -45,7 +46,7 @@
   "overrides": {
     "@smithy/core": "2.5.5"
   },
-  "gitHead": "39dcca08eaaeafa5ba320209dd0a43d457dbd89e",
+  "gitHead": "8a87a2e6a73abdeec79748e5958e22c5d5e7a2c0",
   "peerDependencies": {
     "aws-cdk": "^2.204.0",
     "aws-cdk-lib": "^2.204.0",