@studion/infra-code-blocks 0.4.2 → 0.4.4

package/README.md

@@ -94,6 +94,7 @@ type ProjectArgs = {
     | EcsServiceOptions
   )[];
   enableSSMConnect?: pulumi.Input<boolean>;
+  numberOfAvailabilityZones?: number;
 };
 ```
 
@@ -101,6 +102,7 @@ type ProjectArgs = {
 | :--------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------: |
 | services \*      |                                                                        Service list.                                                                         |
 | enableSSMConnect | Setup ec2 instance and SSM in order to connect to the database in the private subnet. Please refer to the [SSM Connect](#ssm-connect) section for more info. |
+| numberOfAvailabilityZones | Default is 2 which is recommended. If building a dev server, we can reduce to 1 availability zone to reduce hosting cost. |
 
 ```ts
 type DatabaseServiceOptions = {
@@ -109,11 +111,13 @@ type DatabaseServiceOptions = {
   dbName: pulumi.Input<string>;
   username: pulumi.Input<string>;
   password?: pulumi.Input<string>;
+  multiAz?: pulumi.Input<boolean>;
   applyImmediately?: pulumi.Input<boolean>;
   skipFinalSnapshot?: pulumi.Input<boolean>;
   allocatedStorage?: pulumi.Input<number>;
   maxAllocatedStorage?: pulumi.Input<number>;
   instanceClass?: pulumi.Input<string>;
+  enableMonitoring?: pulumi.Input<boolean>;
   tags?: pulumi.Input<{
     [key: string]: pulumi.Input<string>;
   }>;
@@ -359,11 +363,13 @@ type DatabaseArgs = {
   isolatedSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
   vpcCidrBlock: pulumi.Input<string>;
   password?: pulumi.Input<string>;
+  multiAz?: pulumi.Input<boolean>;
   applyImmediately?: pulumi.Input<boolean>;
   skipFinalSnapshot?: pulumi.Input<boolean>;
   allocatedStorage?: pulumi.Input<number>;
   maxAllocatedStorage?: pulumi.Input<number>;
   instanceClass?: pulumi.Input<string>;
+  enableMonitoring?: pulumi.Input<boolean>;
   tags?: pulumi.Input<{
     [key: string]: pulumi.Input<string>;
   }>;

package/dist/components/database.d.ts

@@ -16,6 +16,10 @@ export type DatabaseArgs = {
      * The IPv4 CIDR block for the VPC.
      */
     vpcCidrBlock: pulumi.Input<string>;
+    /**
+     * Specifies if the RDS instance is multi-AZ. Defaults to false.
+     */
+    multiAz?: pulumi.Input<boolean>;
     /**
      * Password for the master DB user. If not specified it will be autogenerated.
      * The value will be stored as a secret in AWS Secret Manager.
@@ -44,6 +48,10 @@ export type DatabaseArgs = {
      * The instance type of the RDS instance. Defaults to 'db.t4g.micro'.
      */
     instanceClass?: pulumi.Input<string>;
+    /**
+     * Set this to true to enable database monitoring. Defaults to false.
+     */
+    enableMonitoring?: pulumi.Input<boolean>;
     /**
      * A map of tags to assign to the resource.
      */
@@ -58,9 +66,11 @@ export declare class Database extends pulumi.ComponentResource {
     dbSubnetGroup: aws.rds.SubnetGroup;
     dbSecurityGroup: aws.ec2.SecurityGroup;
     password: Password;
+    monitoringRole?: aws.iam.Role;
     constructor(name: string, args: DatabaseArgs, opts?: pulumi.ComponentResourceOptions);
     private createSubnetGroup;
     private createSecurityGroup;
     private createEncryptionKey;
+    private createMonitoringRole;
     private createDatabaseInstance;
 }

package/dist/components/database.js

@@ -6,21 +6,27 @@ const pulumi = require("@pulumi/pulumi");
 const password_1 = require("./password");
 const constants_1 = require("../constants");
 const defaults = {
+    multiAz: false,
     applyImmediately: false,
     skipFinalSnapshot: false,
     allocatedStorage: 20,
     maxAllocatedStorage: 100,
     instanceClass: 'db.t4g.micro',
+    enableMonitoring: false,
 };
 class Database extends pulumi.ComponentResource {
     constructor(name, args, opts = {}) {
         super('studion:Database', name, {}, opts);
         this.name = name;
-        const { vpcId, isolatedSubnetIds, vpcCidrBlock } = args;
+        const argsWithDefaults = Object.assign({}, defaults, args);
+        const { vpcId, isolatedSubnetIds, vpcCidrBlock, enableMonitoring } = argsWithDefaults;
         this.dbSubnetGroup = this.createSubnetGroup({ isolatedSubnetIds });
         this.dbSecurityGroup = this.createSecurityGroup({ vpcId, vpcCidrBlock });
         this.kms = this.createEncryptionKey();
         this.password = new password_1.Password(`${this.name}-database-password`, { value: args.password }, { parent: this });
+        if (enableMonitoring) {
+            this.monitoringRole = this.createMonitoringRole();
+        }
         this.instance = this.createDatabaseInstance(args);
         this.registerOutputs();
     }
@@ -58,33 +64,39 @@ class Database extends pulumi.ComponentResource {
         }, { parent: this });
         return kms;
     }
+    createMonitoringRole() {
+        const monitoringRole = new aws.iam.Role(`${this.name}-rds-monitoring`, {
+            assumeRolePolicy: {
+                Version: '2012-10-17',
+                Statement: [
+                    {
+                        Action: 'sts:AssumeRole',
+                        Effect: 'Allow',
+                        Principal: {
+                            Service: 'monitoring.rds.amazonaws.com',
+                        },
+                    },
+                ],
+            },
+        });
+        new aws.iam.RolePolicyAttachment(`${this.name}-rds-monitoring-role-attachment`, {
+            role: monitoringRole.name,
+            policyArn: 'arn:aws:iam::aws:policy/service-role/AmazonRDSEnhancedMonitoringRole',
+        });
+        return monitoringRole;
+    }
     createDatabaseInstance(args) {
         const argsWithDefaults = Object.assign({}, defaults, args);
         const stack = pulumi.getStack();
-        const instance = new aws.rds.Instance(`${this.name}-rds`, {
-            identifierPrefix: `${this.name}-`,
-            engine: 'postgres',
-            engineVersion: '15.3',
-            allocatedStorage: argsWithDefaults.allocatedStorage,
-            maxAllocatedStorage: argsWithDefaults.maxAllocatedStorage,
-            instanceClass: argsWithDefaults.instanceClass,
-            dbName: argsWithDefaults.dbName,
-            username: argsWithDefaults.username,
-            password: this.password.value,
-            dbSubnetGroupName: this.dbSubnetGroup.name,
-            vpcSecurityGroupIds: [this.dbSecurityGroup.id],
-            storageEncrypted: true,
-            kmsKeyId: this.kms.arn,
-            publiclyAccessible: false,
-            skipFinalSnapshot: argsWithDefaults.skipFinalSnapshot,
-            applyImmediately: argsWithDefaults.applyImmediately,
-            autoMinorVersionUpgrade: true,
-            maintenanceWindow: 'Mon:07:00-Mon:07:30',
-            finalSnapshotIdentifier: `${this.name}-final-snapshot-${stack}`,
-            backupWindow: '06:00-06:30',
-            backupRetentionPeriod: 14,
-            tags: Object.assign(Object.assign({}, constants_1.commonTags), argsWithDefaults.tags),
-        }, { parent: this, dependsOn: [this.password] });
+        const monitoringOptions = argsWithDefaults.enableMonitoring && this.monitoringRole
+            ? {
+                monitoringInterval: 60,
+                monitoringRoleArn: this.monitoringRole.arn,
+                performanceInsightsEnabled: true,
+                performanceInsightsRetentionPeriod: 7,
+            }
+            : {};
+        const instance = new aws.rds.Instance(`${this.name}-rds`, Object.assign(Object.assign({ identifierPrefix: `${this.name}-`, engine: 'postgres', engineVersion: '15.3', allocatedStorage: argsWithDefaults.allocatedStorage, maxAllocatedStorage: argsWithDefaults.maxAllocatedStorage, instanceClass: argsWithDefaults.instanceClass, dbName: argsWithDefaults.dbName, username: argsWithDefaults.username, password: this.password.value, dbSubnetGroupName: this.dbSubnetGroup.name, vpcSecurityGroupIds: [this.dbSecurityGroup.id], storageEncrypted: true, kmsKeyId: this.kms.arn, multiAz: argsWithDefaults.multiAz, publiclyAccessible: false, skipFinalSnapshot: argsWithDefaults.skipFinalSnapshot, applyImmediately: argsWithDefaults.applyImmediately, autoMinorVersionUpgrade: true, maintenanceWindow: 'Mon:07:00-Mon:07:30', finalSnapshotIdentifier: `${this.name}-final-snapshot-${stack}`, backupWindow: '06:00-06:30', backupRetentionPeriod: 14 }, monitoringOptions), { tags: Object.assign(Object.assign({}, constants_1.commonTags), argsWithDefaults.tags) }), { parent: this, dependsOn: [this.password] });
         return instance;
     }
 }

package/dist/components/ec2-ssm-connect.js

@@ -18,6 +18,8 @@ class Ec2SSMConnect extends pulumi.ComponentResource {
                 { name: 'ena-support', values: ['true'] },
             ],
             owners: ['amazon'],
+            // TODO: Improve this nameRegex property. Use * for kernel version.
+            // https://docs.aws.amazon.com/linux/al2023/ug/ec2.html
             nameRegex: 'al2023-ami-20[0-9]+.*-kernel-6.1-arm64',
             mostRecent: true,
         });

package/dist/components/project.d.ts

@@ -48,6 +48,7 @@ export type EcsServiceOptions = {
 export type ProjectArgs = {
     services: (DatabaseServiceOptions | RedisServiceOptions | StaticSiteServiceOptions | WebServerServiceOptions | NuxtSSRServiceOptions | MongoServiceOptions | EcsServiceOptions)[];
     enableSSMConnect?: pulumi.Input<boolean>;
+    numberOfAvailabilityZones?: number;
 };
 export declare class MissingEcsCluster extends Error {
     constructor();

package/dist/components/project.js

@@ -37,7 +37,7 @@ class Project extends pulumi.ComponentResource {
         super('studion:Project', name, {}, opts);
         this.services = {};
         this.name = name;
-        this.vpc = this.createVpc();
+        this.vpc = this.createVpc(args.numberOfAvailabilityZones);
         this.createServices(args.services);
         if (args.enableSSMConnect) {
             this.ec2SSMConnect = new ec2_ssm_connect_1.Ec2SSMConnect(`${name}-ssm-connect`, {
@@ -48,9 +48,9 @@ class Project extends pulumi.ComponentResource {
         }
         this.registerOutputs();
     }
-    createVpc() {
+    createVpc(numberOfAvailabilityZones = 2) {
         const vpc = new awsx.ec2.Vpc(`${this.name}-vpc`, {
-            numberOfAvailabilityZones: 2,
+            numberOfAvailabilityZones,
             enableDnsHostnames: true,
             enableDnsSupport: true,
             subnetSpecs: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studion/infra-code-blocks",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Studion common infra components",
   "keywords": [
     "infrastructure",