@fjall/components-infrastructure 0.72.0 → 0.73.2

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.
@@ -2,23 +2,36 @@ import { Construct } from "constructs";
2
2
  import App from "../../app";
3
3
  import { Secret } from "../../resources/aws/secrets";
4
4
  import { Connections, IConnectable, IVpc } from "aws-cdk-lib/aws-ec2";
5
- import { IInstanceEngine } from "aws-cdk-lib/aws-rds";
6
- type StorageType = "Aurora" | "Instance" | "FreeTier";
7
- export type CommonStorageProps = {
5
+ import { IInstanceEngine, IClusterEngine } from "aws-cdk-lib/aws-rds";
6
+ type BaseStorageProps = {
8
7
  vpc?: IVpc;
9
- type: StorageType;
10
8
  databaseName: string;
11
9
  instanceType?: string;
12
10
  };
13
- export type AuroraStorageProps = {} & CommonStorageProps;
14
- export type InstanceStorageProps = {
11
+ export interface AuroraStorageProps extends BaseStorageProps {
12
+ type: "Aurora";
13
+ engine?: IClusterEngine;
14
+ }
15
+ export interface GlobalAuroraStorageProps extends BaseStorageProps {
16
+ type: "GlobalAurora";
17
+ primaryRegion: string;
18
+ globalClusterIdentifier?: string;
19
+ engine?: IClusterEngine;
20
+ }
21
+ export interface InstanceStorageProps extends BaseStorageProps {
22
+ type: "Instance";
15
23
  engine?: IInstanceEngine;
16
24
  allocatedStorage?: number;
17
25
  port?: number;
18
- } & CommonStorageProps;
19
- export type IStorageProps = AuroraStorageProps | InstanceStorageProps;
26
+ }
27
+ export interface FreeTierStorageProps extends BaseStorageProps {
28
+ type: "FreeTier";
29
+ engine?: IInstanceEngine;
30
+ port?: number;
31
+ }
32
+ export type IStorageProps = AuroraStorageProps | InstanceStorageProps | GlobalAuroraStorageProps | FreeTierStorageProps;
20
33
  export declare class StorageFactory {
21
- static build(id: string, props: IStorageProps): (app: App, scope: Construct) => Storage;
34
+ static build<T extends IStorageProps>(id: string, props: T): (app: App, scope: Construct) => Storage;
22
35
  }
23
36
  export declare class Storage extends Construct implements IConnectable {
24
37
  id: string;
@@ -29,6 +42,10 @@ export declare class Storage extends Construct implements IConnectable {
29
42
  private database;
30
43
  constructor(scope: Construct, id: string, props: IStorageProps);
31
44
  addStorage(props: IStorageProps): void;
45
+ private addAurora;
46
+ private addAuroraGlobal;
47
+ private addRdsInstance;
48
+ private addRdsFreeTier;
32
49
  getCredentials(): Secret;
33
50
  getHostEndpoint(): string;
34
51
  getHostPort(): string;
@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Storage = exports.StorageFactory = void 0;
4
4
  const constructs_1 = require("constructs");
5
5
  const database_1 = require("../../resources/aws/database");
6
+ const rdsAuroraGlobal_1 = require("../../resources/aws/database/rdsAuroraGlobal");
6
7
  class StorageFactory {
7
8
  static build(id, props) {
8
9
  return (app, scope) => {
9
10
  const storageProps = {
10
- ...{
11
- vpc: props.vpc || app.getDefaultVpc()
12
- },
13
- ...props
11
+ ...props,
12
+ vpc: (props.vpc || app.getDefaultVpc())
14
13
  };
15
14
  return new Storage(scope, id, storageProps);
16
15
  };
@@ -26,42 +25,67 @@ class Storage extends constructs_1.Construct {
26
25
  this.addStorage(props);
27
26
  }
28
27
  addStorage(props) {
29
- if (props.type === "Aurora") {
30
- if (!props.vpc) {
31
- throw new Error("VPC is required for Aurora database");
32
- }
33
- this.database = new database_1.RdsAurora(this, `${props.databaseName}Rds`, {
34
- vpc: props.vpc,
35
- databaseName: props.databaseName
36
- });
37
- }
38
- else if (props.type === "Instance") {
39
- const iProps = props;
40
- this.database = new database_1.RdsInstance(this, `${iProps.databaseName}Rds`, {
41
- // Common props
42
- vpc: iProps.vpc,
43
- databaseName: iProps.databaseName,
44
- instanceType: iProps.instanceType,
45
- // Instance specific props
46
- allocatedStorage: iProps.allocatedStorage,
47
- port: iProps.port,
48
- engine: iProps.engine
49
- });
50
- }
51
- else if (props.type === "FreeTier") {
52
- const fProps = props;
53
- this.database = new database_1.RdsFreeTier(this, `${fProps.databaseName}Rds`, {
54
- // Common props
55
- vpc: fProps.vpc,
56
- databaseName: fProps.databaseName,
57
- // Instance specific props
58
- port: fProps.port,
59
- engine: fProps.engine
60
- });
61
- }
62
- else {
63
- throw new Error("Invalid database type");
28
+ switch (props.type) {
29
+ case "Aurora":
30
+ this.addAurora(props);
31
+ break;
32
+ case "GlobalAurora":
33
+ this.addAuroraGlobal(props);
34
+ break;
35
+ case "Instance":
36
+ this.addRdsInstance(props);
37
+ break;
38
+ case "FreeTier":
39
+ this.addRdsFreeTier(props);
40
+ break;
41
+ default:
42
+ // Exhaustiveness check
43
+ const _exhaustive = props;
44
+ throw new Error(`Unsupported storage type ${props.type}`);
64
45
  }
46
+ }
47
+ addAurora(props) {
48
+ if (!props.vpc)
49
+ throw new Error("VPC is required for Aurora database");
50
+ this.database = new database_1.RdsAurora(this, `${props.databaseName}Rds`, {
51
+ vpc: props.vpc,
52
+ databaseName: props.databaseName,
53
+ engine: props.engine
54
+ });
55
+ this.connections = this.database.connections;
56
+ }
57
+ addAuroraGlobal(props) {
58
+ if (!props.vpc)
59
+ throw new Error("VPC is required for Global Aurora database");
60
+ if (!props.primaryRegion)
61
+ throw new Error("primaryRegion is required for Global Aurora database");
62
+ this.database = new rdsAuroraGlobal_1.RdsAuroraGlobal(this, `${props.databaseName}RdsGlobal`, {
63
+ vpc: props.vpc,
64
+ databaseName: props.databaseName,
65
+ primaryRegion: props.primaryRegion,
66
+ globalClusterIdentifier: props.globalClusterIdentifier,
67
+ engine: props.engine
68
+ });
69
+ this.connections = this.database.connections;
70
+ }
71
+ addRdsInstance(props) {
72
+ this.database = new database_1.RdsInstance(this, `${props.databaseName}Rds`, {
73
+ vpc: props.vpc,
74
+ databaseName: props.databaseName,
75
+ instanceType: props.instanceType,
76
+ allocatedStorage: props.allocatedStorage,
77
+ port: props.port,
78
+ engine: props.engine
79
+ });
80
+ this.connections = this.database.connections;
81
+ }
82
+ addRdsFreeTier(props) {
83
+ this.database = new database_1.RdsFreeTier(this, `${props.databaseName}Rds`, {
84
+ vpc: props.vpc,
85
+ databaseName: props.databaseName,
86
+ port: props.port,
87
+ engine: props.engine
88
+ });
65
89
  this.connections = this.database.connections;
66
90
  }
67
91
  getCredentials() {
@@ -78,4 +102,4 @@ class Storage extends constructs_1.Construct {
78
102
  }
79
103
  }
80
104
  exports.Storage = Storage;
81
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3Mvc3RvcmFnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwyQ0FBdUM7QUFHdkMsMkRBSXNDO0FBeUJ0QyxNQUFhLGNBQWM7SUFDekIsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFVLEVBQUUsS0FBb0I7UUFDM0MsT0FBTyxDQUFDLEdBQVEsRUFBRSxLQUFnQixFQUFFLEVBQUU7WUFDcEMsTUFBTSxZQUFZLEdBQUc7Z0JBQ25CLEdBQUc7b0JBQ0QsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLGFBQWEsRUFBRTtpQkFDdEM7Z0JBQ0QsR0FBRyxLQUFLO2FBQ1QsQ0FBQztZQUNGLE9BQU8sSUFBSSxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUM5QyxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFaRCx3Q0FZQztBQUVELE1BQWEsT0FBUSxTQUFRLHNCQUFTO0lBVXBDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBb0I7UUFDNUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUNiLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBRW5CLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQztRQUN2QyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxVQUFVLENBQUMsS0FBb0I7UUFDN0IsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQzVCLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUM7Z0JBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFDO1lBQ3pELENBQUM7WUFDRCxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksb0JBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxLQUFLLENBQUMsWUFBWSxLQUFLLEVBQUU7Z0JBQzlELEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRztnQkFDZCxZQUFZLEVBQUUsS0FBSyxDQUFDLFlBQVk7YUFDakMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQzthQUFNLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUNyQyxNQUFNLE1BQU0sR0FBRyxLQUE2QixDQUFDO1lBRTdDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLE1BQU0sQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDakUsZUFBZTtnQkFDZixHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUc7Z0JBQ2YsWUFBWSxFQUFFLE1BQU0sQ0FBQyxZQUFZO2dCQUNqQyxZQUFZLEVBQUUsTUFBTSxDQUFDLFlBQVk7Z0JBQ2pDLDBCQUEwQjtnQkFDMUIsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDLGdCQUFnQjtnQkFDekMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJO2dCQUNqQixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07YUFDdEIsQ0FBQyxDQUFDO1FBQ0wsQ0FBQzthQUFNLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUNyQyxNQUFNLE1BQU0sR0FBRyxLQUE2QixDQUFDO1lBRTdDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLE1BQU0sQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDakUsZUFBZTtnQkFDZixHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUc7Z0JBQ2YsWUFBWSxFQUFFLE1BQU0sQ0FBQyxZQUFZO2dCQUNqQywwQkFBMEI7Z0JBQzFCLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSTtnQkFDakIsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO2FBQ3RCLENBQUMsQ0FBQztRQUNMLENBQUM7YUFBTSxDQUFDO1lBQ04sTUFBTSxJQUFJLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO1FBQzNDLENBQUM7UUFFRCxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDO0lBQy9DLENBQUM7SUFFRCxjQUFjO1FBQ1osT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLGNBQWMsRUFBRSxDQUFDO0lBQ3hDLENBQUM7SUFFRCxlQUFlO1FBQ2IsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxlQUFlO1FBQ2IsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDO0lBQzNCLENBQUM7Q0FDRjtBQTFFRCwwQkEwRUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuaW1wb3J0IEFwcCBmcm9tIFwiLi4vLi4vYXBwXCI7XG5pbXBvcnQge1xuICBSZHNBdXJvcmEsXG4gIFJkc0ZyZWVUaWVyLFxuICBSZHNJbnN0YW5jZVxufSBmcm9tIFwiLi4vLi4vcmVzb3VyY2VzL2F3cy9kYXRhYmFzZVwiO1xuaW1wb3J0IHsgU2VjcmV0IH0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3Mvc2VjcmV0c1wiO1xuXG5pbXBvcnQgeyBDb25uZWN0aW9ucywgSUNvbm5lY3RhYmxlLCBJVnBjIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1lYzJcIjtcbmltcG9ydCB7IElJbnN0YW5jZUVuZ2luZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtcmRzXCI7XG5cbnR5cGUgU3RvcmFnZVR5cGUgPSBcIkF1cm9yYVwiIHwgXCJJbnN0YW5jZVwiIHwgXCJGcmVlVGllclwiO1xuXG5leHBvcnQgdHlwZSBDb21tb25TdG9yYWdlUHJvcHMgPSB7XG4gIHZwYz86IElWcGM7XG4gIHR5cGU6IFN0b3JhZ2VUeXBlO1xuICBkYXRhYmFzZU5hbWU6IHN0cmluZztcbiAgaW5zdGFuY2VUeXBlPzogc3RyaW5nO1xufTtcblxuZXhwb3J0IHR5cGUgQXVyb3JhU3RvcmFnZVByb3BzID0ge30gJiBDb21tb25TdG9yYWdlUHJvcHM7XG5cbmV4cG9ydCB0eXBlIEluc3RhbmNlU3RvcmFnZVByb3BzID0ge1xuICBlbmdpbmU/OiBJSW5zdGFuY2VFbmdpbmU7XG4gIGFsbG9jYXRlZFN0b3JhZ2U/OiBudW1iZXI7XG4gIHBvcnQ/OiBudW1iZXI7XG59ICYgQ29tbW9uU3RvcmFnZVByb3BzO1xuXG5leHBvcnQgdHlwZSBJU3RvcmFnZVByb3BzID0gQXVyb3JhU3RvcmFnZVByb3BzIHwgSW5zdGFuY2VTdG9yYWdlUHJvcHM7XG5cbmV4cG9ydCBjbGFzcyBTdG9yYWdlRmFjdG9yeSB7XG4gIHN0YXRpYyBidWlsZChpZDogc3RyaW5nLCBwcm9wczogSVN0b3JhZ2VQcm9wcykge1xuICAgIHJldHVybiAoYXBwOiBBcHAsIHNjb3BlOiBDb25zdHJ1Y3QpID0+IHtcbiAgICAgIGNvbnN0IHN0b3JhZ2VQcm9wcyA9IHtcbiAgICAgICAgLi4ue1xuICAgICAgICAgIHZwYzogcHJvcHMudnBjIHx8IGFwcC5nZXREZWZhdWx0VnBjKClcbiAgICAgICAgfSxcbiAgICAgICAgLi4ucHJvcHNcbiAgICAgIH07XG4gICAgICByZXR1cm4gbmV3IFN0b3JhZ2Uoc2NvcGUsIGlkLCBzdG9yYWdlUHJvcHMpO1xuICAgIH07XG4gIH1cbn1cblxuZXhwb3J0IGNsYXNzIFN0b3JhZ2UgZXh0ZW5kcyBDb25zdHJ1Y3QgaW1wbGVtZW50cyBJQ29ubmVjdGFibGUge1xuICBwdWJsaWMgaWQ6IHN0cmluZztcbiAgcHVibGljIHNjb3BlOiBDb25zdHJ1Y3Q7XG4gIHB1YmxpYyB2cGM6IElWcGM7XG5cbiAgcHVibGljIGNvbm5lY3Rpb25zOiBDb25uZWN0aW9ucztcblxuICBwcml2YXRlIGRhdGFiYXNlTmFtZTogc3RyaW5nO1xuICBwcml2YXRlIGRhdGFiYXNlOiBSZHNBdXJvcmEgfCBSZHNJbnN0YW5jZSB8IFJkc0ZyZWVUaWVyO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBJU3RvcmFnZVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcbiAgICB0aGlzLmlkID0gaWQ7XG4gICAgdGhpcy5zY29wZSA9IHNjb3BlO1xuXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWU7XG4gICAgdGhpcy5hZGRTdG9yYWdlKHByb3BzKTtcbiAgfVxuXG4gIGFkZFN0b3JhZ2UocHJvcHM6IElTdG9yYWdlUHJvcHMpIHtcbiAgICBpZiAocHJvcHMudHlwZSA9PT0gXCJBdXJvcmFcIikge1xuICAgICAgaWYgKCFwcm9wcy52cGMpIHtcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKFwiVlBDIGlzIHJlcXVpcmVkIGZvciBBdXJvcmEgZGF0YWJhc2VcIik7XG4gICAgICB9XG4gICAgICB0aGlzLmRhdGFiYXNlID0gbmV3IFJkc0F1cm9yYSh0aGlzLCBgJHtwcm9wcy5kYXRhYmFzZU5hbWV9UmRzYCwge1xuICAgICAgICB2cGM6IHByb3BzLnZwYyxcbiAgICAgICAgZGF0YWJhc2VOYW1lOiBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgICAgIH0pO1xuICAgIH0gZWxzZSBpZiAocHJvcHMudHlwZSA9PT0gXCJJbnN0YW5jZVwiKSB7XG4gICAgICBjb25zdCBpUHJvcHMgPSBwcm9wcyBhcyBJbnN0YW5jZVN0b3JhZ2VQcm9wcztcblxuICAgICAgdGhpcy5kYXRhYmFzZSA9IG5ldyBSZHNJbnN0YW5jZSh0aGlzLCBgJHtpUHJvcHMuZGF0YWJhc2VOYW1lfVJkc2AsIHtcbiAgICAgICAgLy8gQ29tbW9uIHByb3BzXG4gICAgICAgIHZwYzogaVByb3BzLnZwYyxcbiAgICAgICAgZGF0YWJhc2VOYW1lOiBpUHJvcHMuZGF0YWJhc2VOYW1lLFxuICAgICAgICBpbnN0YW5jZVR5cGU6IGlQcm9wcy5pbnN0YW5jZVR5cGUsXG4gICAgICAgIC8vIEluc3RhbmNlIHNwZWNpZmljIHByb3BzXG4gICAgICAgIGFsbG9jYXRlZFN0b3JhZ2U6IGlQcm9wcy5hbGxvY2F0ZWRTdG9yYWdlLFxuICAgICAgICBwb3J0OiBpUHJvcHMucG9ydCxcbiAgICAgICAgZW5naW5lOiBpUHJvcHMuZW5naW5lXG4gICAgICB9KTtcbiAgICB9IGVsc2UgaWYgKHByb3BzLnR5cGUgPT09IFwiRnJlZVRpZXJcIikge1xuICAgICAgY29uc3QgZlByb3BzID0gcHJvcHMgYXMgSW5zdGFuY2VTdG9yYWdlUHJvcHM7XG5cbiAgICAgIHRoaXMuZGF0YWJhc2UgPSBuZXcgUmRzRnJlZVRpZXIodGhpcywgYCR7ZlByb3BzLmRhdGFiYXNlTmFtZX1SZHNgLCB7XG4gICAgICAgIC8vIENvbW1vbiBwcm9wc1xuICAgICAgICB2cGM6IGZQcm9wcy52cGMsXG4gICAgICAgIGRhdGFiYXNlTmFtZTogZlByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgLy8gSW5zdGFuY2Ugc3BlY2lmaWMgcHJvcHNcbiAgICAgICAgcG9ydDogZlByb3BzLnBvcnQsXG4gICAgICAgIGVuZ2luZTogZlByb3BzLmVuZ2luZVxuICAgICAgfSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihcIkludmFsaWQgZGF0YWJhc2UgdHlwZVwiKTtcbiAgICB9XG5cbiAgICB0aGlzLmNvbm5lY3Rpb25zID0gdGhpcy5kYXRhYmFzZS5jb25uZWN0aW9ucztcbiAgfVxuXG4gIGdldENyZWRlbnRpYWxzKCk6IFNlY3JldCB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2UuZ2V0Q3JlZGVudGlhbHMoKTtcbiAgfVxuXG4gIGdldEhvc3RFbmRwb2ludCgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLmRhdGFiYXNlLmdldEhvc3RFbmRwb2ludCgpO1xuICB9XG5cbiAgZ2V0SG9zdFBvcnQoKTogc3RyaW5nIHtcbiAgICByZXR1cm4gdGhpcy5kYXRhYmFzZS5nZXRIb3N0UG9ydCgpO1xuICB9XG5cbiAgZ2V0RGF0YWJhc2VOYW1lKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2VOYW1lO1xuICB9XG59XG4iXX0=
105
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/storage.ts"],"names":[],"mappings":"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","sourcesContent":["import { Stack } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\n\nimport App from \"../../app\";\nimport {\n  RdsAurora,\n  RdsFreeTier,\n  RdsInstance\n} from \"../../resources/aws/database\";\nimport { RdsAuroraGlobal } from \"../../resources/aws/database/rdsAuroraGlobal\";\nimport { Secret } from \"../../resources/aws/secrets\";\n\nimport { Connections, IConnectable, IVpc } from \"aws-cdk-lib/aws-ec2\";\nimport { IInstanceEngine, IClusterEngine } from \"aws-cdk-lib/aws-rds\";\n\ntype StorageType = \"Aurora\" | \"Instance\" | \"FreeTier\" | \"GlobalAurora\";\n\ntype BaseStorageProps = {\n  vpc?: IVpc;\n  databaseName: string;\n  instanceType?: string;\n};\n\nexport interface AuroraStorageProps extends BaseStorageProps {\n  type: \"Aurora\";\n  engine?: IClusterEngine;\n}\n\nexport interface GlobalAuroraStorageProps extends BaseStorageProps {\n  type: \"GlobalAurora\";\n  primaryRegion: string;\n  globalClusterIdentifier?: string;\n  engine?: IClusterEngine;\n}\n\nexport interface InstanceStorageProps extends BaseStorageProps {\n  type: \"Instance\";\n  engine?: IInstanceEngine;\n  allocatedStorage?: number;\n  port?: number;\n}\n\nexport interface FreeTierStorageProps extends BaseStorageProps {\n  type: \"FreeTier\";\n  engine?: IInstanceEngine;\n  port?: number;\n}\n\nexport type IStorageProps =\n  | AuroraStorageProps\n  | InstanceStorageProps\n  | GlobalAuroraStorageProps\n  | FreeTierStorageProps;\n\nexport class StorageFactory {\n  static build<T extends IStorageProps>(id: string, props: T) {\n    return (app: App, scope: Construct) => {\n      const storageProps = {\n        ...(props as any),\n        vpc: (props.vpc || app.getDefaultVpc()) as IVpc\n      } as T;\n      return new Storage(scope, id, storageProps);\n    };\n  }\n}\n\nexport class Storage extends Construct implements IConnectable {\n  public id: string;\n  public scope: Construct;\n  public vpc: IVpc;\n\n  public connections: Connections;\n\n  private databaseName: string;\n  private database: RdsAurora | RdsInstance | RdsFreeTier | RdsAuroraGlobal;\n\n  constructor(scope: Construct, id: string, props: IStorageProps) {\n    super(scope, id);\n    this.id = id;\n    this.scope = scope;\n\n    this.databaseName = props.databaseName;\n    this.addStorage(props);\n  }\n\n  addStorage(props: IStorageProps) {\n    switch (props.type) {\n      case \"Aurora\":\n        this.addAurora(props);\n        break;\n      case \"GlobalAurora\":\n        this.addAuroraGlobal(props);\n        break;\n      case \"Instance\":\n        this.addRdsInstance(props);\n        break;\n      case \"FreeTier\":\n        this.addRdsFreeTier(props);\n        break;\n      default:\n        // Exhaustiveness check\n        const _exhaustive: never = props;\n        throw new Error(`Unsupported storage type ${(props as any).type}`);\n    }\n  }\n\n  private addAurora(props: AuroraStorageProps) {\n    if (!props.vpc) throw new Error(\"VPC is required for Aurora database\");\n    this.database = new RdsAurora(this, `${props.databaseName}Rds`, {\n      vpc: props.vpc,\n      databaseName: props.databaseName,\n      engine: props.engine\n    });\n    this.connections = this.database.connections;\n  }\n\n  private addAuroraGlobal(props: GlobalAuroraStorageProps) {\n    if (!props.vpc)\n      throw new Error(\"VPC is required for Global Aurora database\");\n    if (!props.primaryRegion)\n      throw new Error(\"primaryRegion is required for Global Aurora database\");\n\n    this.database = new RdsAuroraGlobal(\n      this,\n      `${props.databaseName}RdsGlobal`,\n      {\n        vpc: props.vpc,\n        databaseName: props.databaseName,\n        primaryRegion: props.primaryRegion,\n        globalClusterIdentifier: props.globalClusterIdentifier,\n        engine: props.engine\n      }\n    );\n    this.connections = this.database.connections;\n  }\n\n  private addRdsInstance(props: InstanceStorageProps) {\n    this.database = new RdsInstance(this, `${props.databaseName}Rds`, {\n      vpc: props.vpc,\n      databaseName: props.databaseName,\n      instanceType: props.instanceType,\n      allocatedStorage: props.allocatedStorage,\n      port: props.port,\n      engine: props.engine\n    });\n    this.connections = this.database.connections;\n  }\n\n  private addRdsFreeTier(props: FreeTierStorageProps) {\n    this.database = new RdsFreeTier(this, `${props.databaseName}Rds`, {\n      vpc: props.vpc,\n      databaseName: props.databaseName,\n      port: props.port,\n      engine: props.engine\n    });\n    this.connections = this.database.connections;\n  }\n\n  getCredentials(): Secret {\n    return this.database.getCredentials();\n  }\n\n  getHostEndpoint(): string {\n    return this.database.getHostEndpoint();\n  }\n\n  getHostPort(): string {\n    return this.database.getHostPort();\n  }\n\n  getDatabaseName(): string {\n    return this.databaseName;\n  }\n}\n"]}
@@ -0,0 +1,34 @@
1
+ import { Construct } from "constructs";
2
+ import { IVpc, Connections, IConnectable } from "aws-cdk-lib/aws-ec2";
3
+ import { IClusterEngine } from "aws-cdk-lib/aws-rds";
4
+ import { Secret } from "../secrets";
5
+ interface RdsAuroraGlobalProps {
6
+ vpc: IVpc;
7
+ databaseName: string;
8
+ /** primary region where the initial cluster & global cluster resource are created */
9
+ primaryRegion: string;
10
+ /** optional deterministic id for the global cluster (should be shared across stacks/regions) */
11
+ globalClusterIdentifier?: string;
12
+ /** optional engine to forward to the underlying cluster */
13
+ engine?: IClusterEngine;
14
+ }
15
+ export declare class RdsAuroraGlobal extends Construct implements IConnectable {
16
+ connections: Connections;
17
+ private globalCluster?;
18
+ private primaryCluster?;
19
+ private regionalCluster?;
20
+ private props;
21
+ private currentRegion;
22
+ private globalId;
23
+ constructor(scope: Construct, id: string, props: RdsAuroraGlobalProps);
24
+ getGlobalClusterIdentifier(): string;
25
+ getPrimaryClusterIdentifier(): string;
26
+ private getGlobalClusterEngineString;
27
+ addGlobalCluster(): void;
28
+ addAuroraCluster(): void;
29
+ addOutputs(): void;
30
+ getCredentials(): Secret;
31
+ getHostEndpoint(): string;
32
+ getHostPort(): string;
33
+ }
34
+ export {};
@@ -0,0 +1,112 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RdsAuroraGlobal = void 0;
4
+ const aws_cdk_lib_1 = require("aws-cdk-lib");
5
+ const aws_rds_1 = require("aws-cdk-lib/aws-rds");
6
+ const constructs_1 = require("constructs");
7
+ const rdsAurora_1 = require("./rdsAurora");
8
+ class RdsAuroraGlobal extends constructs_1.Construct {
9
+ constructor(scope, id, props) {
10
+ super(scope, id);
11
+ this.props = props;
12
+ this.currentRegion = aws_cdk_lib_1.Stack.of(this).region;
13
+ this.globalId =
14
+ props.globalClusterIdentifier || `${props.databaseName}-global`;
15
+ // create clusters / global cluster depending on region
16
+ this.addAuroraCluster();
17
+ this.addGlobalCluster();
18
+ this.addOutputs();
19
+ }
20
+ // --- public helpers ---
21
+ getGlobalClusterIdentifier() {
22
+ return this.globalId;
23
+ }
24
+ getPrimaryClusterIdentifier() {
25
+ return `${this.props.databaseName}-primary-cluster`;
26
+ }
27
+ getGlobalClusterEngineString() {
28
+ // Default to aurora-postgresql if no engine specified (matches existing behavior)
29
+ if (!this.props.engine)
30
+ return "aurora-postgresql";
31
+ // DatabaseClusterEngine has engineType which will be "aurora-postgresql" or "aurora-mysql"
32
+ return this.props.engine.engineType || "aurora-postgresql";
33
+ }
34
+ // create the CfnGlobalCluster only in the primary region
35
+ addGlobalCluster() {
36
+ if (this.props.primaryRegion !== this.currentRegion)
37
+ return;
38
+ // create the global cluster resource referencing the primary cluster identifier
39
+ this.globalCluster = new aws_rds_1.CfnGlobalCluster(this, `${this.props.databaseName}GlobalCluster`, {
40
+ globalClusterIdentifier: this.globalId,
41
+ engine: this.getGlobalClusterEngineString(),
42
+ sourceDbClusterIdentifier: this.getPrimaryClusterIdentifier()
43
+ });
44
+ // ensure the underlying primary DBCluster L1 has the globalClusterIdentifier set
45
+ if (this.primaryCluster) {
46
+ const primaryL1 = this.primaryCluster.node.defaultChild;
47
+ if (primaryL1) {
48
+ primaryL1.globalClusterIdentifier = this.globalId;
49
+ }
50
+ }
51
+ }
52
+ // create an Aurora cluster in this region (primary or secondary)
53
+ addAuroraCluster() {
54
+ if (this.props.primaryRegion === this.currentRegion) {
55
+ // primary
56
+ this.primaryCluster = new rdsAurora_1.RdsAurora(this, `${this.props.databaseName}Primary`, {
57
+ vpc: this.props.vpc,
58
+ databaseName: this.props.databaseName,
59
+ engine: this.props.engine,
60
+ clusterIdentifier: this.getPrimaryClusterIdentifier()
61
+ });
62
+ this.connections = this.primaryCluster.connections;
63
+ }
64
+ else {
65
+ // secondary region
66
+ this.regionalCluster = new rdsAurora_1.RdsAurora(this, `${this.props.databaseName}Regional`, {
67
+ vpc: this.props.vpc,
68
+ databaseName: this.props.databaseName,
69
+ engine: this.props.engine,
70
+ clusterIdentifier: `${this.props.databaseName}-secondary-${this.currentRegion}`
71
+ });
72
+ // set the L1 DBCluster property so CloudFormation will join it to the global cluster
73
+ if (this.regionalCluster) {
74
+ const regionalL1 = this.regionalCluster.node
75
+ .defaultChild;
76
+ if (regionalL1) {
77
+ regionalL1.globalClusterIdentifier = this.globalId;
78
+ }
79
+ this.connections = this.regionalCluster.connections;
80
+ }
81
+ }
82
+ }
83
+ addOutputs() {
84
+ new aws_cdk_lib_1.CfnOutput(this, `${this.props.databaseName}GlobalClusterIdentifierOutput`, {
85
+ value: this.globalId,
86
+ exportName: `${this.props.databaseName}GlobalClusterIdentifier`
87
+ });
88
+ }
89
+ getCredentials() {
90
+ if (this.primaryCluster)
91
+ return this.primaryCluster.getCredentials();
92
+ if (this.regionalCluster)
93
+ return this.regionalCluster.getCredentials();
94
+ throw new Error("No Aurora cluster available to return credentials from");
95
+ }
96
+ getHostEndpoint() {
97
+ if (this.primaryCluster)
98
+ return this.primaryCluster.getHostEndpoint();
99
+ if (this.regionalCluster)
100
+ return this.regionalCluster.getHostEndpoint();
101
+ throw new Error("No Aurora cluster available to return endpoint from");
102
+ }
103
+ getHostPort() {
104
+ if (this.primaryCluster)
105
+ return this.primaryCluster.getHostPort();
106
+ if (this.regionalCluster)
107
+ return this.regionalCluster.getHostPort();
108
+ throw new Error("No Aurora cluster available to return port from");
109
+ }
110
+ }
111
+ exports.RdsAuroraGlobal = RdsAuroraGlobal;
112
+ //# 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    // DatabaseClusterEngine has engineType which will be \"aurora-postgresql\" or \"aurora-mysql\"\n    return (this.props.engine as any).engineType || \"aurora-postgresql\";\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        engine: this.getGlobalClusterEngineString(),\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"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fjall/components-infrastructure",
3
- "version": "0.72.0",
3
+ "version": "0.73.2",
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.72.0",
38
+ "@fjall/util": "^0.73.2",
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": "be0408762d5f20ef87932f859267503b75069c4f",
47
+ "gitHead": "cfe49280842a341a64da4aa70abe5052eb163397",
48
48
  "peerDependencies": {
49
49
  "aws-cdk": "^2.206.0",
50
50
  "aws-cdk-lib": "^2.206.0",