@studion/infra-code-blocks 0.5.2 → 0.6.0

package/README.md

@@ -12,7 +12,7 @@ Studion Platform common infra components.
 ## Prerequisites
 
 - Working [Pulumi](https://www.pulumi.com/docs/clouds/aws/get-started/begin/#pulumi-aws-before-you-begin) project
-- AWS account with neccessary permissions for each studion component
+- AWS account with necessary permissions for each Studion component
 
 ## Installation
 
@@ -48,7 +48,7 @@ const project = new studion.Project('demo-project', {
 export const projectName = project.name;
 ```
 
-- Deploy pulumi stack
+- Deploy Pulumi stack
 
 ```bash
 $ pulumi up
@@ -68,10 +68,14 @@ $ pulumi up
 
 ### Project
 
-Project component makes it really easy to spin up project infrastructure,
+Project component makes it easy to spin up project infrastructure,
 hiding infrastructure complexity.
 <br>
-The component creates its own VPC which is used for resources within the project.
+The component creates its own VPC used for resources within the project.
+<br><br>
+Services are created only if specified in the `services` list.
+<br>
+If `services` is an empty list, VPC is the only service created by default.
 
 ```ts
 new Project(name: string, args: ProjectArgs, opts?: pulumi.CustomResourceOptions);
@@ -102,7 +106,7 @@ type ProjectArgs = {
 | Argument         |                                                                         Description                                                                          |
 | :--------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------: |
 | 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. |
+| enableSSMConnect | Set up 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
@@ -257,7 +261,7 @@ type EcsServiceOptions = {
 
 Often, web server depends on other services such as database, Redis, etc.
 For that purpose, environment factory can be used. The factory function
-recieves services bag as argument.
+receives services bag as argument.
 
 ```ts
 const project = new studion.Project('demo-project', {
@@ -287,7 +291,7 @@ const project = new studion.Project('demo-project', {
 });
 ```
 
-In order to pass sensitive information to the container use `secrets` instead of `environment`. AWS will fetch values from
+In order to pass sensitive information to the container, use `secrets` instead of `environment`. AWS will fetch values from
 Secret Manager based on arn that is provided for the `valueFrom` field.
 
 ```ts
@@ -379,7 +383,7 @@ type DatabaseArgs = {
 };
 ```
 
-If the password is not specified it will be autogenerated.
+If the password is not specified, it will be autogenerated.
 The database password is stored as a secret inside AWS Secret Manager.
 The secret will be available on the `Database` resource as `password.secret`.
 
@@ -407,8 +411,8 @@ new DatabaseReplica(name: string, args: DatabaseReplicaArgs, opts?: pulumi.Custo
 ```ts
 type DatabaseReplicaArgs = {
   replicateSourceDb: pulumi.Input<string>;
-  dbSubnetGroupName: pulumi.Input<string>;
   dbSecurityGroupId: pulumi.Input<string>;
+  dbSubnetGroupName?: pulumi.Input<string>;
   monitoringRole?: aws.iam.Role;
   multiAz?: pulumi.Input<boolean>;
   applyImmediately?: pulumi.Input<boolean>;
@@ -421,7 +425,15 @@ type DatabaseReplicaArgs = {
   }>;
 };
 ```
-Database replica requires primary DB instance to exist.
+Database replica requires primary DB instance to exist. If the replica is in the same
+region as primary instance, we should not set `dbSubnetGroupNameParam`.
+The `replicateSourceDb` param is referenced like this:
+```javascript
+  const primaryDb = new studion.Database(...);
+  const replica = new studion.DatabaseReplica('replica', {
+    replicateSourceDb: primaryDb.instance.identifier
+  });
+```
 
 ### Redis
 
@@ -510,7 +522,7 @@ Features:
 - creates TLS certificate for the specified domain
 - redirects HTTP traffic to HTTPS
 - creates CloudWatch log group
-- comes with predefined cpu and memory options: `small`, `medium`, `large`, `xlarge`
+- comes with predefined CPU and memory options: `small`, `medium`, `large`, `xlarge`
 
 <br>
 
@@ -565,7 +577,7 @@ Features:
 - creates TLS certificate for the specified domain
 - redirects HTTP traffic to HTTPS
 - creates CloudWatch log group
-- comes with predefined cpu and memory options: `small`, `medium`, `large`, `xlarge`
+- comes with predefined CPU and memory options: `small`, `medium`, `large`, `xlarge`
 - CDN in front of the application load balancer for static resource caching
 
 <br>
@@ -616,7 +628,7 @@ Features:
 - persistent storage
 - service auto-discovery
 - creates CloudWatch log group
-- comes with predefined cpu and memory options: `small`, `medium`, `large`, `xlarge`
+- comes with predefined CPU and memory options: `small`, `medium`, `large`, `xlarge`
 
 <br>
 
@@ -648,7 +660,7 @@ export type MongoArgs = {
 ```
 
 If the password is not specified it will be autogenerated.
-The mongo password is stored as a secret inside AWS Secret Manager.
+The Mongo password is stored as a secret inside AWS Secret Manager.
 The secret will be available on the `Mongo` resource as `password.secret`.
 
 ### Ecs Service
@@ -658,7 +670,7 @@ AWS ECS Fargate.
 Features:
 
 - memory and CPU autoscaling
-- service auto discovery
+- service auto-discovery
 - persistent storage
 - CloudWatch logs
 - comes with predefined cpu and memory options: `small`, `medium`, `large`, `xlarge`
@@ -739,7 +751,7 @@ Where `CLUSTER_NAME` is the name of the ECS cluster and `TASK_FAMILY_NAME` is th
 
 ## SSM Connect
 
-The [Database](#database) component deploys a database instance inside a isolated subnet,
+The [Database](#database) component deploys a database instance inside an isolated subnet,
 and it's not publicly accessible from outside of VPC.
 <br>
 In order to connect to the database we need to deploy the ec2 instance which will be used
@@ -788,7 +800,7 @@ Now you can use your favorite database client to connect to the database.
 ![RDS connection](/assets/images/rds-connection.png)
 
 It is important that for the host you set `localhost` and for the port you set `5555`
-because we are port forwarding traffic from
+because we are port-forwarding traffic from
 localhost:5555 to DATABASE_ADDRESS:DATABASE_PORT.
 For the user, password, and database field, set values which are set in the `Project`.
 

package/dist/components/database-replica.d.ts

@@ -10,7 +10,7 @@ export type DatabaseReplicaArgs = {
      * * If primary DB is instance of studion:Database, it can be accessed as
      * `db.dbSubnetGroup.name`.
      */
-    dbSubnetGroupName: pulumi.Input<string>;
+    dbSubnetGroupName?: pulumi.Input<string>;
     /**
      * DB security group ID. Should be the same as primary instance.
      * If primary DB is instance of studion:Database, it can be accessed as

package/dist/components/database.js

@@ -96,7 +96,7 @@ class Database extends pulumi.ComponentResource {
                 performanceInsightsRetentionPeriod: 7,
             }
             : {};
-        const instance = new aws.rds.Instance(`${this.name}-rds`, Object.assign(Object.assign({ identifierPrefix: `${this.name}-`, engine: 'postgres', engineVersion: '15.5', 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, parameterGroupName: argsWithDefaults.parameterGroupName }, monitoringOptions), { tags: Object.assign(Object.assign({}, constants_1.commonTags), argsWithDefaults.tags) }), { parent: this, dependsOn: [this.password] });
+        const instance = new aws.rds.Instance(`${this.name}-rds`, Object.assign(Object.assign({ identifierPrefix: `${this.name}-`, engine: 'postgres', engineVersion: '15.5', 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, caCertIdentifier: 'rds-ca-rsa2048-g1', parameterGroupName: argsWithDefaults.parameterGroupName }, monitoringOptions), { tags: Object.assign(Object.assign({}, constants_1.commonTags), argsWithDefaults.tags) }), { parent: this, dependsOn: [this.password] });
         return instance;
     }
 }

package/dist/components/mongo.d.ts

@@ -2,6 +2,7 @@ import * as pulumi from '@pulumi/pulumi';
 import { EcsService, EcsServiceArgs } from './ecs-service';
 import { Password } from './password';
 export type MongoArgs = Pick<EcsServiceArgs, 'size' | 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'tags'> & {
+    privateSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
     /**
      * Username for the master DB user.
      */
@@ -11,11 +12,18 @@ export type MongoArgs = Pick<EcsServiceArgs, 'size' | 'clusterId' | 'clusterName
      * The value will be stored as a secret in AWS Secret Manager.
      */
     password?: pulumi.Input<string>;
-    privateSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
+    /**
+     * Mongo Docker image. Defaults to mongo:7.0.3.
+     */
+    image?: pulumi.Input<string>;
     /**
      * Exposed service port. Defaults to 27017.
      */
     port?: pulumi.Input<number>;
+    /**
+     * Persistent storage volume path. Defaults to '/data/db'.
+     */
+    persistentStorageVolumePath?: pulumi.Input<string>;
 };
 export declare class Mongo extends pulumi.ComponentResource {
     name: string;

package/dist/components/mongo.js

@@ -18,11 +18,15 @@ const password_1 = require("./password");
 class Mongo extends pulumi.ComponentResource {
     constructor(name, args, opts = {}) {
         super('studion:Mongo', name, args, opts);
+        const image = args.image ||
+            'mongo:7.0.3@sha256:238b1636bdd7820c752b91bec8a669f92568eb313ad89a1fc4a92903c1b40489';
         const port = args.port || 27017;
+        const persistentStorageVolumePath = args.persistentStorageVolumePath || '/data/db';
         const { username, password, privateSubnetIds } = args, ecsServiceArgs = __rest(args, ["username", "password", "privateSubnetIds"]);
         this.name = name;
         this.password = new password_1.Password(`${this.name}-mongo-password`, { value: password }, { parent: this });
-        this.service = new ecs_service_1.EcsService(name, Object.assign(Object.assign({}, ecsServiceArgs), { port, image: 'mongo:7.0.3@sha256:238b1636bdd7820c752b91bec8a669f92568eb313ad89a1fc4a92903c1b40489', desiredCount: 1, autoscaling: { enabled: false }, enableServiceAutoDiscovery: true, persistentStorageVolumePath: '/data/db', dockerCommand: ['mongod', '--port', port.toString()], assignPublicIp: false, subnetIds: privateSubnetIds, environment: [
+        this.service = new ecs_service_1.EcsService(name, Object.assign(Object.assign({}, ecsServiceArgs), { port,
+            image, desiredCount: 1, autoscaling: { enabled: false }, enableServiceAutoDiscovery: true, persistentStorageVolumePath, dockerCommand: ['mongod', '--port', port.toString()], assignPublicIp: false, subnetIds: privateSubnetIds, environment: [
                 {
                     name: 'MONGO_INITDB_ROOT_USERNAME',
                     value: username,

package/package.json

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