@fjall/components-infrastructure 0.69.10 → 0.70.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,5 +26,6 @@ export declare class ManagedOrganisation extends Stack {
26
26
  private enableTrustedAccess;
27
27
  private enableCostAllocationTags;
28
28
  private setupIdentityCenter;
29
+ private updateEnvironmentConfig;
29
30
  }
30
31
  export {};
@@ -9,6 +9,7 @@ const ramSharing_1 = require("../../config/aws/ramSharing");
9
9
  const costAllocationTags_1 = require("../../config/aws/costAllocationTags");
10
10
  const organisation_1 = require("../../config/aws/organisation");
11
11
  const organisationsAccess_1 = require("../../config/aws/organisationsAccess");
12
+ const util_1 = require("@fjall/util");
12
13
  class ManagedOrganisation extends aws_cdk_lib_1.Stack {
13
14
  constructor(id, props) {
14
15
  super(app_1.default.getInstance(), id, props);
@@ -35,6 +36,7 @@ class ManagedOrganisation extends aws_cdk_lib_1.Stack {
35
36
  this.enableTrustedAccess(props);
36
37
  this.enableCostAllocationTags(props);
37
38
  this.setupIdentityCenter(orgAccounts, props);
39
+ this.updateEnvironmentConfig(props);
38
40
  }
39
41
  getPlatformAccountId(orgAccounts, props) {
40
42
  const platformEntry = Object.entries(props.accounts).find(([key]) => key.toLowerCase() === "platform");
@@ -77,6 +79,37 @@ class ManagedOrganisation extends aws_cdk_lib_1.Stack {
77
79
  });
78
80
  }
79
81
  }
82
+ updateEnvironmentConfig(props) {
83
+ try {
84
+ const config = util_1.Config.loadConfig();
85
+ const orgAccounts = this.organisation.getAccounts();
86
+ const providerAccounts = [];
87
+ for (const [environmentType, accountList] of Object.entries(props.accounts)) {
88
+ const accountsArray = Array.isArray(accountList)
89
+ ? accountList
90
+ : [accountList];
91
+ for (const accountName of accountsArray) {
92
+ const accountId = orgAccounts[accountName];
93
+ if (accountId) {
94
+ providerAccounts.push({
95
+ id: accountId,
96
+ name: accountName.toLowerCase(),
97
+ environment: environmentType
98
+ });
99
+ }
100
+ else {
101
+ console.warn(`Warning: Account "${accountName}" not found in organisation accounts`);
102
+ }
103
+ }
104
+ }
105
+ config.rootConfig.providerAccounts = providerAccounts;
106
+ config.saveConfig();
107
+ }
108
+ catch (error) {
109
+ const errorMessage = error instanceof Error ? error.message : String(error);
110
+ console.warn(`Warning: Failed to update fjall-config.json with environment mappings: ${errorMessage}`);
111
+ }
112
+ }
80
113
  }
81
114
  exports.ManagedOrganisation = ManagedOrganisation;
82
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"managedOrganisation.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/managedOrganisation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Environment, Stack, StackProps } from \"aws-cdk-lib\";\n\nimport App from \"../../app\";\n\nimport { IdentityCenter } from \"../../config/aws/identityCenter\";\nimport { IpamDelegateAdmin } from \"../../config/aws/ipamDelegateAdmin\";\nimport { RamSharing } from \"../../config/aws/ramSharing\";\nimport {\n  CostAllocationTags,\n  ICostAllocationTags\n} from \"../../config/aws/costAllocationTags\";\nimport Organisation from \"../../config/aws/organisation\";\nimport { Account } from \"@aws-sdk/client-organizations\";\nimport { ActivateOrganisationsAccess } from \"../../config/aws/organisationsAccess\";\n\ntype ExtendedStackProps = Omit<StackProps, \"env\"> & {\n  env: Required<Pick<Environment, \"region\" | \"account\">> &\n    Partial<Omit<Environment, \"region\" | \"account\">>;\n};\n\ntype AccountsConfig = {\n  readonly [key: string]: readonly string[] | string;\n};\n\ninterface ManagedOrganisationProps extends ExtendedStackProps {\n  organisationName: string;\n  accounts: AccountsConfig;\n  orgEmail: string;\n  existingAccounts?: Account[];\n  costAllocationTags: ICostAllocationTags[];\n  identityCenter?: boolean;\n}\n\nexport class ManagedOrganisation extends Stack {\n  private organisation: Organisation;\n\n  constructor(id: string, props: ManagedOrganisationProps) {\n    super(App.getInstance(), id, props);\n    this.createOrganisation(props);\n    this.setupOrganisationFeatures({\n      ...props,\n      identityCenter: props.identityCenter ?? true\n    });\n  }\n\n  private createOrganisation(props: ManagedOrganisationProps) {\n    this.organisation = new Organisation(this, \"ManagedOrganisation\", {\n      organisationName: props.organisationName,\n      accounts: props.accounts,\n      orgEmail: props.orgEmail,\n      env: props.env,\n      existingAccounts: props.existingAccounts\n    });\n  }\n\n  private setupOrganisationFeatures(props: ManagedOrganisationProps) {\n    const orgAccounts = this.organisation.getAccounts();\n    const platformAccountId = this.getPlatformAccountId(orgAccounts, props);\n\n    this.setupIpamDelegation(platformAccountId);\n    this.enableRamSharing();\n    this.enableTrustedAccess(props);\n    this.enableCostAllocationTags(props);\n    this.setupIdentityCenter(orgAccounts, props);\n  }\n\n  private getPlatformAccountId(\n    orgAccounts: Record<string, string>,\n    props: ManagedOrganisationProps\n  ) {\n    const platformEntry = Object.entries(props.accounts).find(\n      ([key]) => key.toLowerCase() === \"platform\"\n    );\n\n    if (!platformEntry) {\n      throw new Error(\n        'No platform account found. Please include a \"platform\" key in your accounts configuration.'\n      );\n    }\n\n    const account = platformEntry[1];\n    const platformAccount = Array.isArray(account) ? account[0] : account;\n\n    const platformAccountId = orgAccounts[platformAccount];\n\n    if (!platformAccountId) {\n      throw new Error(\n        `Platform account ID not found for account name: ${platformAccount}`\n      );\n    }\n\n    return platformAccountId;\n  }\n\n  private setupIpamDelegation(platformAccountId: string) {\n    new IpamDelegateAdmin(this, \"IpamDelegateAdmin\", {\n      accountId: platformAccountId\n    });\n  }\n\n  private enableRamSharing() {\n    new RamSharing(this, \"RamSharing\");\n  }\n\n  private enableTrustedAccess(props: ManagedOrganisationProps) {\n    new ActivateOrganisationsAccess(this, \"ActivateOrganisationsAccess\", {\n      account: props.env.account,\n      region: props.env.region\n    });\n  }\n\n  private enableCostAllocationTags(props: ManagedOrganisationProps) {\n    if (props.costAllocationTags.length > 0) {\n      new CostAllocationTags(this, \"CostAllocationTags\", {\n        costAllocationTags: props.costAllocationTags\n      });\n    }\n  }\n\n  private setupIdentityCenter(\n    orgAccounts: Record<string, string>,\n    props: ManagedOrganisationProps\n  ) {\n    if (props.identityCenter) {\n      new IdentityCenter(this, \"IdentityCenter\", {\n        accounts: orgAccounts\n      });\n    }\n  }\n}\n"]}
115
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"managedOrganisation.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/managedOrganisation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Environment, Stack, StackProps } from \"aws-cdk-lib\";\n\nimport App from \"../../app\";\n\nimport { IdentityCenter } from \"../../config/aws/identityCenter\";\nimport { IpamDelegateAdmin } from \"../../config/aws/ipamDelegateAdmin\";\nimport { RamSharing } from \"../../config/aws/ramSharing\";\nimport {\n  CostAllocationTags,\n  ICostAllocationTags\n} from \"../../config/aws/costAllocationTags\";\nimport Organisation from \"../../config/aws/organisation\";\nimport { Account } from \"@aws-sdk/client-organizations\";\nimport { ActivateOrganisationsAccess } from \"../../config/aws/organisationsAccess\";\nimport { Config, ProviderAccount } from \"@fjall/util\";\n\ntype ExtendedStackProps = Omit<StackProps, \"env\"> & {\n  env: Required<Pick<Environment, \"region\" | \"account\">> &\n    Partial<Omit<Environment, \"region\" | \"account\">>;\n};\n\ntype AccountsConfig = {\n  readonly [key: string]: readonly string[] | string;\n};\n\ninterface ManagedOrganisationProps extends ExtendedStackProps {\n  organisationName: string;\n  accounts: AccountsConfig;\n  orgEmail: string;\n  existingAccounts?: Account[];\n  costAllocationTags: ICostAllocationTags[];\n  identityCenter?: boolean;\n}\n\nexport class ManagedOrganisation extends Stack {\n  private organisation: Organisation;\n\n  constructor(id: string, props: ManagedOrganisationProps) {\n    super(App.getInstance(), id, props);\n    this.createOrganisation(props);\n    this.setupOrganisationFeatures({\n      ...props,\n      identityCenter: props.identityCenter ?? true\n    });\n  }\n\n  private createOrganisation(props: ManagedOrganisationProps) {\n    this.organisation = new Organisation(this, \"ManagedOrganisation\", {\n      organisationName: props.organisationName,\n      accounts: props.accounts,\n      orgEmail: props.orgEmail,\n      env: props.env,\n      existingAccounts: props.existingAccounts\n    });\n  }\n\n  private setupOrganisationFeatures(props: ManagedOrganisationProps) {\n    const orgAccounts = this.organisation.getAccounts();\n    const platformAccountId = this.getPlatformAccountId(orgAccounts, props);\n\n    this.setupIpamDelegation(platformAccountId);\n    this.enableRamSharing();\n    this.enableTrustedAccess(props);\n    this.enableCostAllocationTags(props);\n    this.setupIdentityCenter(orgAccounts, props);\n    this.updateEnvironmentConfig(props);\n  }\n\n  private getPlatformAccountId(\n    orgAccounts: Record<string, string>,\n    props: ManagedOrganisationProps\n  ) {\n    const platformEntry = Object.entries(props.accounts).find(\n      ([key]) => key.toLowerCase() === \"platform\"\n    );\n\n    if (!platformEntry) {\n      throw new Error(\n        'No platform account found. Please include a \"platform\" key in your accounts configuration.'\n      );\n    }\n\n    const account = platformEntry[1];\n    const platformAccount = Array.isArray(account) ? account[0] : account;\n\n    const platformAccountId = orgAccounts[platformAccount];\n\n    if (!platformAccountId) {\n      throw new Error(\n        `Platform account ID not found for account name: ${platformAccount}`\n      );\n    }\n\n    return platformAccountId;\n  }\n\n  private setupIpamDelegation(platformAccountId: string) {\n    new IpamDelegateAdmin(this, \"IpamDelegateAdmin\", {\n      accountId: platformAccountId\n    });\n  }\n\n  private enableRamSharing() {\n    new RamSharing(this, \"RamSharing\");\n  }\n\n  private enableTrustedAccess(props: ManagedOrganisationProps) {\n    new ActivateOrganisationsAccess(this, \"ActivateOrganisationsAccess\", {\n      account: props.env.account,\n      region: props.env.region\n    });\n  }\n\n  private enableCostAllocationTags(props: ManagedOrganisationProps) {\n    if (props.costAllocationTags.length > 0) {\n      new CostAllocationTags(this, \"CostAllocationTags\", {\n        costAllocationTags: props.costAllocationTags\n      });\n    }\n  }\n\n  private setupIdentityCenter(\n    orgAccounts: Record<string, string>,\n    props: ManagedOrganisationProps\n  ) {\n    if (props.identityCenter) {\n      new IdentityCenter(this, \"IdentityCenter\", {\n        accounts: orgAccounts\n      });\n    }\n  }\n\n  private updateEnvironmentConfig(props: ManagedOrganisationProps) {\n    try {\n      const config = Config.loadConfig();\n      const orgAccounts = this.organisation.getAccounts();\n      const providerAccounts: ProviderAccount[] = [];\n\n      for (const [environmentType, accountList] of Object.entries(\n        props.accounts\n      )) {\n        const accountsArray = Array.isArray(accountList)\n          ? accountList\n          : [accountList];\n\n        for (const accountName of accountsArray) {\n          const accountId = orgAccounts[accountName];\n          if (accountId) {\n            providerAccounts.push({\n              id: accountId,\n              name: accountName.toLowerCase(),\n              environment: environmentType\n            });\n          } else {\n            console.warn(\n              `Warning: Account \"${accountName}\" not found in organisation accounts`\n            );\n          }\n        }\n      }\n      config.rootConfig.providerAccounts = providerAccounts;\n      config.saveConfig();\n    } catch (error) {\n      const errorMessage = error instanceof Error ? error.message : String(error);\n      console.warn(\n        `Warning: Failed to update fjall-config.json with environment mappings: ${errorMessage}`\n      );\n    }\n  }\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fjall/components-infrastructure",
3
- "version": "0.69.10",
3
+ "version": "0.70.1",
4
4
  "bin": {
5
5
  "infrastructure": "bin/infrastructure.js"
6
6
  },
@@ -35,7 +35,7 @@
35
35
  },
36
36
  "dependencies": {
37
37
  "@aws-sdk/client-organizations": "^3.716.0",
38
- "@fjall/util": "^0.69.10",
38
+ "@fjall/util": "^0.70.1",
39
39
  "@pepperize/cdk-organizations": "^0.7.135",
40
40
  "cdk-time-sleep": "^1.0.0",
41
41
  "constructs": "^10.0.0",
@@ -44,7 +44,7 @@
44
44
  "overrides": {
45
45
  "@smithy/core": "2.5.5"
46
46
  },
47
- "gitHead": "74197f7cb785f3d231d80c777736effdbadbed69",
47
+ "gitHead": "915ada88094a5b061c8e53e459a932c97d5fb3e1",
48
48
  "peerDependencies": {
49
49
  "aws-cdk": "^2.206.0",
50
50
  "aws-cdk-lib": "^2.206.0",