@fjall/components-infrastructure 0.73.4 → 0.73.6

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.
@@ -61,7 +61,8 @@ class RdsAurora extends constructs_1.Construct {
61
61
  },
62
62
  storageEncrypted: true,
63
63
  storageEncryptionKey: encryptionKey.key,
64
- clusterIdentifier: props.clusterIdentifier || `${props.databaseName}-cluster`,
64
+ clusterIdentifier: props.clusterIdentifier?.toLowerCase() ||
65
+ `${props.databaseName?.toLowerCase()}-cluster`,
65
66
  credentials: aws_rds_1.Credentials.fromSecret(this.databaseCredentials.secret),
66
67
  defaultDatabaseName: props.databaseName || `${id.replace("Rds", "")}`,
67
68
  monitoringInterval: props.monitoringInterval || aws_cdk_lib_1.Duration.minutes(1),
@@ -132,4 +133,4 @@ class RdsAurora extends constructs_1.Construct {
132
133
  }
133
134
  }
134
135
  exports.RdsAurora = RdsAurora;
135
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsAurora.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsAurora.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  IConnectable,\n  IVpc,\n  Port,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  AuroraPostgresEngineVersion,\n  BackupProps,\n  CaCertificate,\n  ClusterInstance,\n  Credentials,\n  DatabaseCluster,\n  DatabaseClusterEngine,\n  DatabaseProxy,\n  IClusterEngine,\n  ProxyTarget\n} from \"aws-cdk-lib/aws-rds\";\nimport {\n  SecretRotation,\n  SecretRotationApplication\n} from \"aws-cdk-lib/aws-secretsmanager\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../iam\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { KeyValue } from \"../../../types\";\n\ninterface RdsProps {\n  vpc: IVpc;\n  databaseName?: string;\n  engine?: IClusterEngine;\n  backup?: BackupProps;\n  clusterIdentifier?: string;\n  monitoringInterval?: Duration;\n  preferredMaintenanceWindow?: string;\n  port?: number;\n  writer?: ClusterInstance;\n  readers?: ClusterInstance[];\n}\n\nexport class RdsAurora extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private port: number;\n\n  private databaseProxy: DatabaseProxy;\n  private databaseCredentials: Secret;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n\n    this.port = props.port || 5432;\n\n    // Database Credentials\n    this.databaseCredentials = new Secret(\n      this,\n      `${props.databaseName}Credentials`,\n      {\n        secretName: `${props.databaseName}Credentials`,\n        generateSecretString: {\n          secretStringTemplate: JSON.stringify({\n            username: \"postgres\"\n          }),\n          excludePunctuation: true,\n          includeSpace: false,\n          generateStringKey: \"password\"\n        }\n      }\n    );\n\n    // Customer Managed Keys\n    const encryptionKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}ClusterEncryptionKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/encryptionKey`\n      }\n    );\n\n    const primaryReaderInsightsKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}PrimaryReaderInsightsKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/PrimaryReaderInsightsKey`\n      }\n    );\n\n    const secondaryReaderInsightsKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}SecondaryReaderInsightsKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/SecondaryReaderInsightsKey`\n      }\n    );\n\n    const primaryWriterPerformanceInsightsKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}PrimaryWriterPerformanceInsightsKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/PrimaryWriterInsightsKey`\n      }\n    );\n\n    const clusterSecurityGroup = new SecurityGroup(this, `${id}SecurityGroup`, {\n      vpc: props.vpc,\n      description: `Security group that allows inbound access to the postgres cluster for ${props.databaseName}`\n    });\n\n    //TODO: Remove this line, that allows the proxy to connect to the database. Replace with seperated security groups\n    clusterSecurityGroup.addIngressRule(clusterSecurityGroup, Port.tcp(5432));\n\n    this.connections = clusterSecurityGroup.connections;\n\n    // Database Cluster\n    const databaseCluster = new DatabaseCluster(scope, `${id}Database`, {\n      vpc: props.vpc,\n      vpcSubnets: {\n        subnetType: SubnetType.PRIVATE_WITH_EGRESS\n      },\n      securityGroups: [clusterSecurityGroup],\n      engine:\n        props.engine ||\n        DatabaseClusterEngine.auroraPostgres({\n          //TODO: Do we update these when we release a new version? Or try to keep them constantly updated?\n          version: AuroraPostgresEngineVersion.VER_15_6\n        }),\n      backup: props.backup || {\n        retention: Duration.days(14)\n      },\n      storageEncrypted: true,\n      storageEncryptionKey: encryptionKey.key,\n      clusterIdentifier:\n        props.clusterIdentifier || `${props.databaseName}-cluster`,\n      credentials: Credentials.fromSecret(this.databaseCredentials.secret),\n      defaultDatabaseName: props.databaseName || `${id.replace(\"Rds\", \"\")}`,\n      monitoringInterval: props.monitoringInterval || Duration.minutes(1),\n      preferredMaintenanceWindow:\n        props.preferredMaintenanceWindow || \"Sat:12:30-Sat:20:30\",\n      port: props.port || 5432,\n      removalPolicy: RemovalPolicy.SNAPSHOT,\n      writer:\n        props.writer ||\n        ClusterInstance.serverlessV2(`${props.databaseName}Writer`, {\n          enablePerformanceInsights: true,\n          performanceInsightEncryptionKey:\n            primaryWriterPerformanceInsightsKey.key,\n          instanceIdentifier: `${props.databaseName}-primary-writer`,\n          //TODO: Do we update these when we release a new version? Or try to keep them constantly updated?\n          caCertificate: CaCertificate.RDS_CA_RSA4096_G1\n        }),\n      readers: props.readers || [\n        ClusterInstance.serverlessV2(`${props.databaseName}PrimaryReader`, {\n          scaleWithWriter: true,\n          enablePerformanceInsights: true,\n          performanceInsightEncryptionKey: primaryReaderInsightsKey.key,\n          instanceIdentifier: `${props.databaseName}-primary-reader`,\n          caCertificate: CaCertificate.RDS_CA_RSA4096_G1\n        }),\n        ClusterInstance.serverlessV2(`${props.databaseName}SecondaryReader`, {\n          scaleWithWriter: false,\n          enablePerformanceInsights: true,\n          performanceInsightEncryptionKey: secondaryReaderInsightsKey.key,\n          instanceIdentifier: `${props.databaseName}-secondary-reader`,\n          caCertificate: CaCertificate.RDS_CA_RSA4096_G1\n        })\n      ]\n    });\n\n    this.databaseProxy = new DatabaseProxy(\n      this,\n      `${props.databaseName}DatabaseProxy`,\n      {\n        proxyTarget: ProxyTarget.fromCluster(databaseCluster),\n        secrets: [this.databaseCredentials.secret],\n        securityGroups: [clusterSecurityGroup],\n        vpc: props.vpc,\n        vpcSubnets: {\n          subnetType: SubnetType.PUBLIC\n        }\n      }\n    );\n\n    new CfnOutput(this, `${props.databaseName}ProxyEndpointOutput`, {\n      key: `${props.databaseName}ProxyEndpoint`,\n      exportName: `${props.databaseName}ProxyEndpoint`,\n      value: this.databaseProxy.endpoint\n    });\n\n    // Rotate the Secret every 30 days\n    const masterSecret = new Secret(this, `${props.databaseName}MasterSecret`, {\n      secretName: `${props.databaseName}MasterSecret`\n    });\n\n    new SecretRotation(this, `${props.databaseName}SecretRotation`, {\n      application: new SecretRotationApplication(\n        \"SecretsManagerRDSPostgreSQLRotationMultiUser\",\n        \"1.1.367\",\n        {\n          isMultiUser: true\n        }\n      ),\n      secret: this.databaseCredentials.secret,\n      masterSecret: masterSecret.secret,\n      target: databaseCluster,\n      vpc: databaseCluster.vpc\n    });\n  }\n\n  getHostEndpoint(): string {\n    return this.databaseProxy.endpoint;\n  }\n\n  getHostPort(): string {\n    return String(this.port);\n  }\n\n  getCredentials(): Secret {\n    return this.databaseCredentials;\n  }\n}\n"]}
136
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsAurora.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsAurora.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  IConnectable,\n  IVpc,\n  Port,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  AuroraPostgresEngineVersion,\n  BackupProps,\n  CaCertificate,\n  ClusterInstance,\n  Credentials,\n  DatabaseCluster,\n  DatabaseClusterEngine,\n  DatabaseProxy,\n  IClusterEngine,\n  ProxyTarget\n} from \"aws-cdk-lib/aws-rds\";\nimport {\n  SecretRotation,\n  SecretRotationApplication\n} from \"aws-cdk-lib/aws-secretsmanager\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../iam\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { KeyValue } from \"../../../types\";\n\ninterface RdsProps {\n  vpc: IVpc;\n  databaseName?: string;\n  engine?: IClusterEngine;\n  backup?: BackupProps;\n  clusterIdentifier?: string;\n  monitoringInterval?: Duration;\n  preferredMaintenanceWindow?: string;\n  port?: number;\n  writer?: ClusterInstance;\n  readers?: ClusterInstance[];\n}\n\nexport class RdsAurora extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private port: number;\n\n  private databaseProxy: DatabaseProxy;\n  private databaseCredentials: Secret;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n\n    this.port = props.port || 5432;\n\n    // Database Credentials\n    this.databaseCredentials = new Secret(\n      this,\n      `${props.databaseName}Credentials`,\n      {\n        secretName: `${props.databaseName}Credentials`,\n        generateSecretString: {\n          secretStringTemplate: JSON.stringify({\n            username: \"postgres\"\n          }),\n          excludePunctuation: true,\n          includeSpace: false,\n          generateStringKey: \"password\"\n        }\n      }\n    );\n\n    // Customer Managed Keys\n    const encryptionKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}ClusterEncryptionKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/encryptionKey`\n      }\n    );\n\n    const primaryReaderInsightsKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}PrimaryReaderInsightsKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/PrimaryReaderInsightsKey`\n      }\n    );\n\n    const secondaryReaderInsightsKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}SecondaryReaderInsightsKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/SecondaryReaderInsightsKey`\n      }\n    );\n\n    const primaryWriterPerformanceInsightsKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}PrimaryWriterPerformanceInsightsKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/PrimaryWriterInsightsKey`\n      }\n    );\n\n    const clusterSecurityGroup = new SecurityGroup(this, `${id}SecurityGroup`, {\n      vpc: props.vpc,\n      description: `Security group that allows inbound access to the postgres cluster for ${props.databaseName}`\n    });\n\n    //TODO: Remove this line, that allows the proxy to connect to the database. Replace with seperated security groups\n    clusterSecurityGroup.addIngressRule(clusterSecurityGroup, Port.tcp(5432));\n\n    this.connections = clusterSecurityGroup.connections;\n\n    // Database Cluster\n    const databaseCluster = new DatabaseCluster(scope, `${id}Database`, {\n      vpc: props.vpc,\n      vpcSubnets: {\n        subnetType: SubnetType.PRIVATE_WITH_EGRESS\n      },\n      securityGroups: [clusterSecurityGroup],\n      engine:\n        props.engine ||\n        DatabaseClusterEngine.auroraPostgres({\n          //TODO: Do we update these when we release a new version? Or try to keep them constantly updated?\n          version: AuroraPostgresEngineVersion.VER_15_6\n        }),\n      backup: props.backup || {\n        retention: Duration.days(14)\n      },\n      storageEncrypted: true,\n      storageEncryptionKey: encryptionKey.key,\n      clusterIdentifier:\n        props.clusterIdentifier?.toLowerCase() ||\n        `${props.databaseName?.toLowerCase()}-cluster`,\n      credentials: Credentials.fromSecret(this.databaseCredentials.secret),\n      defaultDatabaseName: props.databaseName || `${id.replace(\"Rds\", \"\")}`,\n      monitoringInterval: props.monitoringInterval || Duration.minutes(1),\n      preferredMaintenanceWindow:\n        props.preferredMaintenanceWindow || \"Sat:12:30-Sat:20:30\",\n      port: props.port || 5432,\n      removalPolicy: RemovalPolicy.SNAPSHOT,\n      writer:\n        props.writer ||\n        ClusterInstance.serverlessV2(`${props.databaseName}Writer`, {\n          enablePerformanceInsights: true,\n          performanceInsightEncryptionKey:\n            primaryWriterPerformanceInsightsKey.key,\n          instanceIdentifier: `${props.databaseName}-primary-writer`,\n          //TODO: Do we update these when we release a new version? Or try to keep them constantly updated?\n          caCertificate: CaCertificate.RDS_CA_RSA4096_G1\n        }),\n      readers: props.readers || [\n        ClusterInstance.serverlessV2(`${props.databaseName}PrimaryReader`, {\n          scaleWithWriter: true,\n          enablePerformanceInsights: true,\n          performanceInsightEncryptionKey: primaryReaderInsightsKey.key,\n          instanceIdentifier: `${props.databaseName}-primary-reader`,\n          caCertificate: CaCertificate.RDS_CA_RSA4096_G1\n        }),\n        ClusterInstance.serverlessV2(`${props.databaseName}SecondaryReader`, {\n          scaleWithWriter: false,\n          enablePerformanceInsights: true,\n          performanceInsightEncryptionKey: secondaryReaderInsightsKey.key,\n          instanceIdentifier: `${props.databaseName}-secondary-reader`,\n          caCertificate: CaCertificate.RDS_CA_RSA4096_G1\n        })\n      ]\n    });\n\n    this.databaseProxy = new DatabaseProxy(\n      this,\n      `${props.databaseName}DatabaseProxy`,\n      {\n        proxyTarget: ProxyTarget.fromCluster(databaseCluster),\n        secrets: [this.databaseCredentials.secret],\n        securityGroups: [clusterSecurityGroup],\n        vpc: props.vpc,\n        vpcSubnets: {\n          subnetType: SubnetType.PUBLIC\n        }\n      }\n    );\n\n    new CfnOutput(this, `${props.databaseName}ProxyEndpointOutput`, {\n      key: `${props.databaseName}ProxyEndpoint`,\n      exportName: `${props.databaseName}ProxyEndpoint`,\n      value: this.databaseProxy.endpoint\n    });\n\n    // Rotate the Secret every 30 days\n    const masterSecret = new Secret(this, `${props.databaseName}MasterSecret`, {\n      secretName: `${props.databaseName}MasterSecret`\n    });\n\n    new SecretRotation(this, `${props.databaseName}SecretRotation`, {\n      application: new SecretRotationApplication(\n        \"SecretsManagerRDSPostgreSQLRotationMultiUser\",\n        \"1.1.367\",\n        {\n          isMultiUser: true\n        }\n      ),\n      secret: this.databaseCredentials.secret,\n      masterSecret: masterSecret.secret,\n      target: databaseCluster,\n      vpc: databaseCluster.vpc\n    });\n  }\n\n  getHostEndpoint(): string {\n    return this.databaseProxy.endpoint;\n  }\n\n  getHostPort(): string {\n    return String(this.port);\n  }\n\n  getCredentials(): Secret {\n    return this.databaseCredentials;\n  }\n}\n"]}
@@ -10,8 +10,10 @@ class RdsAuroraGlobal extends constructs_1.Construct {
10
10
  super(scope, id);
11
11
  this.props = props;
12
12
  this.currentRegion = aws_cdk_lib_1.Stack.of(this).region;
13
+ // Ensure global cluster identifier is lowercase for consistency with other identifiers
13
14
  this.globalId =
14
- props.globalClusterIdentifier || `${props.databaseName}-global`;
15
+ props.globalClusterIdentifier?.toLowerCase() ||
16
+ `${props.databaseName.toLowerCase()}-global`;
15
17
  // create clusters / global cluster depending on region
16
18
  this.addAuroraCluster();
17
19
  this.addGlobalCluster();
@@ -22,7 +24,7 @@ class RdsAuroraGlobal extends constructs_1.Construct {
22
24
  return this.globalId;
23
25
  }
24
26
  getPrimaryClusterIdentifier() {
25
- return `${this.props.databaseName}-primary-cluster`;
27
+ return `${this.props.databaseName.toLowerCase()}-primary-cluster`;
26
28
  }
27
29
  getGlobalClusterEngineString() {
28
30
  // Default to aurora-postgresql if no engine specified (matches existing behavior)
@@ -58,16 +60,25 @@ class RdsAuroraGlobal extends constructs_1.Construct {
58
60
  if (this.props.primaryRegion !== this.currentRegion)
59
61
  return;
60
62
  // create the global cluster resource referencing the primary cluster identifier
63
+ // Prefer referencing the L1 DBCluster Ref so CloudFormation will create the
64
+ // DBCluster first and we avoid identifier-casing mismatches.
65
+ let sourceIdentifier = this.getPrimaryClusterIdentifier();
66
+ let primaryL1;
67
+ if (this.primaryCluster) {
68
+ primaryL1 = this.primaryCluster.node.defaultChild;
69
+ if (primaryL1) {
70
+ sourceIdentifier = primaryL1.ref;
71
+ }
72
+ }
61
73
  this.globalCluster = new aws_rds_1.CfnGlobalCluster(this, `${this.props.databaseName}GlobalCluster`, {
62
74
  globalClusterIdentifier: this.globalId,
63
- sourceDbClusterIdentifier: this.getPrimaryClusterIdentifier()
75
+ sourceDbClusterIdentifier: sourceIdentifier
64
76
  });
65
77
  // ensure the underlying primary DBCluster L1 has the globalClusterIdentifier set
66
- if (this.primaryCluster) {
67
- const primaryL1 = this.primaryCluster.node.defaultChild;
68
- if (primaryL1) {
69
- primaryL1.globalClusterIdentifier = this.globalId;
70
- }
78
+ if (primaryL1) {
79
+ // Make the CFN dependency explicit so the DBCluster is created before the GlobalCluster
80
+ this.globalCluster.addDependsOn(primaryL1);
81
+ primaryL1.globalClusterIdentifier = this.globalId;
71
82
  }
72
83
  }
73
84
  // create an Aurora cluster in this region (primary or secondary)
@@ -130,4 +141,4 @@ class RdsAuroraGlobal extends constructs_1.Construct {
130
141
  }
131
142
  }
132
143
  exports.RdsAuroraGlobal = RdsAuroraGlobal;
133
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsAuroraGlobal.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsAuroraGlobal.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Stack } from \"aws-cdk-lib\";\nimport { CfnGlobalCluster, CfnDBCluster } from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { IVpc, Connections, IConnectable } from \"aws-cdk-lib/aws-ec2\";\nimport { IClusterEngine } from \"aws-cdk-lib/aws-rds\";\nimport { RdsAurora } from \"./rdsAurora\";\nimport { Secret } from \"../secrets\";\n\ninterface RdsAuroraGlobalProps {\n  vpc: IVpc;\n  databaseName: string;\n  /** primary region where the initial cluster & global cluster resource are created */\n  primaryRegion: string;\n  /** optional deterministic id for the global cluster (should be shared across stacks/regions) */\n  globalClusterIdentifier?: string;\n  /** optional engine to forward to the underlying cluster */\n  engine?: IClusterEngine;\n}\n\nexport class RdsAuroraGlobal extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private globalCluster?: CfnGlobalCluster;\n  private primaryCluster?: RdsAurora;\n  private regionalCluster?: RdsAurora;\n  private props: RdsAuroraGlobalProps;\n  private currentRegion: string;\n  private globalId: string;\n\n  constructor(scope: Construct, id: string, props: RdsAuroraGlobalProps) {\n    super(scope, id);\n\n    this.props = props;\n    this.currentRegion = Stack.of(this).region;\n    this.globalId =\n      props.globalClusterIdentifier || `${props.databaseName}-global`;\n\n    // create clusters / global cluster depending on region\n    this.addAuroraCluster();\n    this.addGlobalCluster();\n    this.addOutputs();\n  }\n\n  // --- public helpers ---\n  getGlobalClusterIdentifier(): string {\n    return this.globalId;\n  }\n\n  getPrimaryClusterIdentifier(): string {\n    return `${this.props.databaseName}-primary-cluster`;\n  }\n\n  private getGlobalClusterEngineString(): string {\n    // Default to aurora-postgresql if no engine specified (matches existing behavior)\n    if (!this.props.engine) return \"aurora-postgresql\";\n\n    const engineObj: any = this.props.engine as any;\n\n    // Try common locations for the engine identifier\n    let engineType: unknown =\n      engineObj.engineType ?? engineObj.engine ?? engineObj.name;\n\n    // If the engine was provided as a raw string (unlikely but support it)\n    if (typeof this.props.engine === \"string\") {\n      engineType = this.props.engine;\n    }\n\n    // Fallback to toString() for Token-like objects\n    if (!engineType && typeof engineObj.toString === \"function\") {\n      try {\n        engineType = engineObj.toString();\n      } catch (e) {\n        engineType = undefined;\n      }\n    }\n\n    if (typeof engineType !== \"string\") return \"aurora-postgresql\";\n\n    // Normalize common forms: AURORA_POSTGRESQL -> aurora-postgresql, aurora_postgresql -> aurora-postgresql\n    const normalized = engineType.toLowerCase().replace(/_/g, \"-\");\n\n    // If the normalized value is just 'aurora', prefer the more specific postgres default\n    if (normalized === \"aurora\") return \"aurora-postgresql\";\n\n    return normalized;\n  }\n\n  // create the CfnGlobalCluster only in the primary region\n  addGlobalCluster() {\n    if (this.props.primaryRegion !== this.currentRegion) return;\n\n    // create the global cluster resource referencing the primary cluster identifier\n    this.globalCluster = new CfnGlobalCluster(\n      this,\n      `${this.props.databaseName}GlobalCluster`,\n      {\n        globalClusterIdentifier: this.globalId,\n        sourceDbClusterIdentifier: this.getPrimaryClusterIdentifier()\n      }\n    );\n\n    // ensure the underlying primary DBCluster L1 has the globalClusterIdentifier set\n    if (this.primaryCluster) {\n      const primaryL1 = this.primaryCluster.node.defaultChild as CfnDBCluster;\n      if (primaryL1) {\n        primaryL1.globalClusterIdentifier = this.globalId;\n      }\n    }\n  }\n\n  // create an Aurora cluster in this region (primary or secondary)\n  addAuroraCluster() {\n    if (this.props.primaryRegion === this.currentRegion) {\n      // primary\n      this.primaryCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Primary`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          engine: this.props.engine,\n          clusterIdentifier: this.getPrimaryClusterIdentifier()\n        }\n      );\n      this.connections = this.primaryCluster.connections;\n    } else {\n      // secondary region\n      this.regionalCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Regional`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          engine: this.props.engine,\n          clusterIdentifier: `${this.props.databaseName}-secondary-${this.currentRegion}`\n        }\n      );\n\n      // set the L1 DBCluster property so CloudFormation will join it to the global cluster\n      if (this.regionalCluster) {\n        const regionalL1 = this.regionalCluster.node\n          .defaultChild as CfnDBCluster;\n        if (regionalL1) {\n          regionalL1.globalClusterIdentifier = this.globalId;\n        }\n        this.connections = this.regionalCluster.connections;\n      }\n    }\n  }\n\n  addOutputs() {\n    new CfnOutput(\n      this,\n      `${this.props.databaseName}GlobalClusterIdentifierOutput`,\n      {\n        value: this.globalId,\n        exportName: `${this.props.databaseName}GlobalClusterIdentifier`\n      }\n    );\n  }\n\n  getCredentials(): Secret {\n    if (this.primaryCluster) return this.primaryCluster.getCredentials();\n    if (this.regionalCluster) return this.regionalCluster.getCredentials();\n    throw new Error(\"No Aurora cluster available to return credentials from\");\n  }\n\n  getHostEndpoint(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostEndpoint();\n    if (this.regionalCluster) return this.regionalCluster.getHostEndpoint();\n    throw new Error(\"No Aurora cluster available to return endpoint from\");\n  }\n\n  getHostPort(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostPort();\n    if (this.regionalCluster) return this.regionalCluster.getHostPort();\n    throw new Error(\"No Aurora cluster available to return port from\");\n  }\n}\n"]}
144
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsAuroraGlobal.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsAuroraGlobal.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Stack } from \"aws-cdk-lib\";\nimport { CfnGlobalCluster, CfnDBCluster } from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { IVpc, Connections, IConnectable } from \"aws-cdk-lib/aws-ec2\";\nimport { IClusterEngine } from \"aws-cdk-lib/aws-rds\";\nimport { RdsAurora } from \"./rdsAurora\";\nimport { Secret } from \"../secrets\";\n\ninterface RdsAuroraGlobalProps {\n  vpc: IVpc;\n  databaseName: string;\n  /** primary region where the initial cluster & global cluster resource are created */\n  primaryRegion: string;\n  /** optional deterministic id for the global cluster (should be shared across stacks/regions) */\n  globalClusterIdentifier?: string;\n  /** optional engine to forward to the underlying cluster */\n  engine?: IClusterEngine;\n}\n\nexport class RdsAuroraGlobal extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private globalCluster?: CfnGlobalCluster;\n  private primaryCluster?: RdsAurora;\n  private regionalCluster?: RdsAurora;\n  private props: RdsAuroraGlobalProps;\n  private currentRegion: string;\n  private globalId: string;\n\n  constructor(scope: Construct, id: string, props: RdsAuroraGlobalProps) {\n    super(scope, id);\n\n    this.props = props;\n    this.currentRegion = Stack.of(this).region;\n    // Ensure global cluster identifier is lowercase for consistency with other identifiers\n    this.globalId =\n      props.globalClusterIdentifier?.toLowerCase() ||\n      `${props.databaseName.toLowerCase()}-global`;\n\n    // create clusters / global cluster depending on region\n    this.addAuroraCluster();\n    this.addGlobalCluster();\n    this.addOutputs();\n  }\n\n  // --- public helpers ---\n  getGlobalClusterIdentifier(): string {\n    return this.globalId;\n  }\n\n  getPrimaryClusterIdentifier(): string {\n    return `${this.props.databaseName.toLowerCase()}-primary-cluster`;\n  }\n\n  private getGlobalClusterEngineString(): string {\n    // Default to aurora-postgresql if no engine specified (matches existing behavior)\n    if (!this.props.engine) return \"aurora-postgresql\";\n\n    const engineObj: any = this.props.engine as any;\n\n    // Try common locations for the engine identifier\n    let engineType: unknown =\n      engineObj.engineType ?? engineObj.engine ?? engineObj.name;\n\n    // If the engine was provided as a raw string (unlikely but support it)\n    if (typeof this.props.engine === \"string\") {\n      engineType = this.props.engine;\n    }\n\n    // Fallback to toString() for Token-like objects\n    if (!engineType && typeof engineObj.toString === \"function\") {\n      try {\n        engineType = engineObj.toString();\n      } catch (e) {\n        engineType = undefined;\n      }\n    }\n\n    if (typeof engineType !== \"string\") return \"aurora-postgresql\";\n\n    // Normalize common forms: AURORA_POSTGRESQL -> aurora-postgresql, aurora_postgresql -> aurora-postgresql\n    const normalized = engineType.toLowerCase().replace(/_/g, \"-\");\n\n    // If the normalized value is just 'aurora', prefer the more specific postgres default\n    if (normalized === \"aurora\") return \"aurora-postgresql\";\n\n    return normalized;\n  }\n\n  // create the CfnGlobalCluster only in the primary region\n  addGlobalCluster() {\n    if (this.props.primaryRegion !== this.currentRegion) return;\n\n    // create the global cluster resource referencing the primary cluster identifier\n    // Prefer referencing the L1 DBCluster Ref so CloudFormation will create the\n    // DBCluster first and we avoid identifier-casing mismatches.\n    let sourceIdentifier: any = this.getPrimaryClusterIdentifier();\n    let primaryL1: CfnDBCluster | undefined;\n\n    if (this.primaryCluster) {\n      primaryL1 = this.primaryCluster.node.defaultChild as CfnDBCluster;\n      if (primaryL1) {\n        sourceIdentifier = primaryL1.ref;\n      }\n    }\n\n    this.globalCluster = new CfnGlobalCluster(\n      this,\n      `${this.props.databaseName}GlobalCluster`,\n      {\n        globalClusterIdentifier: this.globalId,\n        sourceDbClusterIdentifier: sourceIdentifier\n      }\n    );\n\n    // ensure the underlying primary DBCluster L1 has the globalClusterIdentifier set\n    if (primaryL1) {\n      // Make the CFN dependency explicit so the DBCluster is created before the GlobalCluster\n      this.globalCluster.addDependsOn(primaryL1);\n      primaryL1.globalClusterIdentifier = this.globalId;\n    }\n  }\n\n  // create an Aurora cluster in this region (primary or secondary)\n  addAuroraCluster() {\n    if (this.props.primaryRegion === this.currentRegion) {\n      // primary\n      this.primaryCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Primary`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          engine: this.props.engine,\n          clusterIdentifier: this.getPrimaryClusterIdentifier()\n        }\n      );\n      this.connections = this.primaryCluster.connections;\n    } else {\n      // secondary region\n      this.regionalCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Regional`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          engine: this.props.engine,\n          clusterIdentifier: `${this.props.databaseName}-secondary-${this.currentRegion}`\n        }\n      );\n\n      // set the L1 DBCluster property so CloudFormation will join it to the global cluster\n      if (this.regionalCluster) {\n        const regionalL1 = this.regionalCluster.node\n          .defaultChild as CfnDBCluster;\n        if (regionalL1) {\n          regionalL1.globalClusterIdentifier = this.globalId;\n        }\n        this.connections = this.regionalCluster.connections;\n      }\n    }\n  }\n\n  addOutputs() {\n    new CfnOutput(\n      this,\n      `${this.props.databaseName}GlobalClusterIdentifierOutput`,\n      {\n        value: this.globalId,\n        exportName: `${this.props.databaseName}GlobalClusterIdentifier`\n      }\n    );\n  }\n\n  getCredentials(): Secret {\n    if (this.primaryCluster) return this.primaryCluster.getCredentials();\n    if (this.regionalCluster) return this.regionalCluster.getCredentials();\n    throw new Error(\"No Aurora cluster available to return credentials from\");\n  }\n\n  getHostEndpoint(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostEndpoint();\n    if (this.regionalCluster) return this.regionalCluster.getHostEndpoint();\n    throw new Error(\"No Aurora cluster available to return endpoint from\");\n  }\n\n  getHostPort(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostPort();\n    if (this.regionalCluster) return this.regionalCluster.getHostPort();\n    throw new Error(\"No Aurora cluster available to return port from\");\n  }\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fjall/components-infrastructure",
3
- "version": "0.73.4",
3
+ "version": "0.73.6",
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.73.4",
38
+ "@fjall/util": "^0.73.6",
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": "031ba471b6b7e20db6dd7943cd2bfde8a1492dee",
47
+ "gitHead": "9a5389e8d3c9f72afadd4af68512fce0a234fb34",
48
48
  "peerDependencies": {
49
49
  "aws-cdk": "^2.206.0",
50
50
  "aws-cdk-lib": "^2.206.0",