@studion/infra-code-blocks 0.3.0 → 0.4.0

package/README.md

@@ -372,7 +372,7 @@ type DatabaseArgs = {
 
 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 `passwordSecret`.
+The secret will be available on the `Database` resource as `password.secret`.
 
 ### Redis
 
@@ -600,7 +600,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 secret will be available on the `Mongo` resource as `passwordSecret`.
+The secret will be available on the `Mongo` resource as `password.secret`.
 
 ### Ecs Service
 

package/dist/components/database.d.ts

@@ -1,5 +1,6 @@
 import * as aws from '@pulumi/aws';
 import * as pulumi from '@pulumi/pulumi';
+import { Password } from './password';
 export type DatabaseArgs = {
     /**
      * The name of the database to create when the DB instance is created.
@@ -56,11 +57,10 @@ export declare class Database extends pulumi.ComponentResource {
     kms: aws.kms.Key;
     dbSubnetGroup: aws.rds.SubnetGroup;
     dbSecurityGroup: aws.ec2.SecurityGroup;
-    passwordSecret: aws.secretsmanager.Secret;
+    password: Password;
     constructor(name: string, args: DatabaseArgs, opts?: pulumi.ComponentResourceOptions);
     private createSubnetGroup;
     private createSecurityGroup;
     private createEncryptionKey;
-    private createPasswordSecret;
     private createDatabaseInstance;
 }

package/dist/components/database.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Database = void 0;
 const aws = require("@pulumi/aws");
 const pulumi = require("@pulumi/pulumi");
-const random = require("@pulumi/random");
+const password_1 = require("./password");
 const constants_1 = require("../constants");
 const defaults = {
     applyImmediately: false,
@@ -20,9 +20,8 @@ class Database extends pulumi.ComponentResource {
         this.dbSubnetGroup = this.createSubnetGroup({ isolatedSubnetIds });
         this.dbSecurityGroup = this.createSecurityGroup({ vpcId, vpcCidrBlock });
         this.kms = this.createEncryptionKey();
-        const { instance, passwordSecret } = this.createDatabaseInstance(args);
-        this.instance = instance;
-        this.passwordSecret = passwordSecret;
+        this.password = new password_1.Password(`${this.name}-database-password`, { value: args.password }, { parent: this });
+        this.instance = this.createDatabaseInstance(args);
         this.registerOutputs();
     }
     createSubnetGroup({ isolatedSubnetIds, }) {
@@ -59,29 +58,9 @@ class Database extends pulumi.ComponentResource {
         }, { parent: this });
         return kms;
     }
-    createPasswordSecret({ password }) {
-        const project = pulumi.getProject();
-        const stack = pulumi.getStack();
-        const passwordSecret = new aws.secretsmanager.Secret(`${this.name}-password-secret`, {
-            namePrefix: `${stack}/${project}/DatabasePassword-`,
-            tags: constants_1.commonTags,
-        }, { parent: this });
-        const passwordSecretValue = new aws.secretsmanager.SecretVersion(`${this.name}-password-secret-value`, {
-            secretId: passwordSecret.id,
-            secretString: password,
-        }, { parent: this, dependsOn: [passwordSecret] });
-        return passwordSecret;
-    }
     createDatabaseInstance(args) {
         const argsWithDefaults = Object.assign({}, defaults, args);
         const stack = pulumi.getStack();
-        const password = argsWithDefaults.password ||
-            new random.RandomPassword(`${this.name}-db-password`, {
-                length: 16,
-                overrideSpecial: '_%$',
-                special: true,
-            }).result;
-        const passwordSecret = this.createPasswordSecret({ password });
         const instance = new aws.rds.Instance(`${this.name}-rds`, {
             identifierPrefix: `${this.name}-`,
             engine: 'postgres',
@@ -91,7 +70,7 @@ class Database extends pulumi.ComponentResource {
             instanceClass: argsWithDefaults.instanceClass,
             dbName: argsWithDefaults.dbName,
             username: argsWithDefaults.username,
-            password,
+            password: this.password.value,
             dbSubnetGroupName: this.dbSubnetGroup.name,
             vpcSecurityGroupIds: [this.dbSecurityGroup.id],
             storageEncrypted: true,
@@ -105,8 +84,8 @@ class Database extends pulumi.ComponentResource {
             backupWindow: '06:00-06:30',
             backupRetentionPeriod: 14,
             tags: Object.assign(Object.assign({}, constants_1.commonTags), argsWithDefaults.tags),
-        }, { parent: this });
-        return { instance, passwordSecret };
+        }, { parent: this, dependsOn: [this.password] });
+        return instance;
     }
 }
 exports.Database = Database;

package/dist/components/mongo.d.ts

@@ -1,6 +1,6 @@
 import * as pulumi from '@pulumi/pulumi';
-import * as aws from '@pulumi/aws';
 import { EcsService, EcsServiceArgs } from './ecs-service';
+import { Password } from './password';
 export type MongoArgs = Pick<EcsServiceArgs, 'size' | 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'tags'> & {
     /**
      * Username for the master DB user.
@@ -20,8 +20,6 @@ export type MongoArgs = Pick<EcsServiceArgs, 'size' | 'clusterId' | 'clusterName
 export declare class Mongo extends pulumi.ComponentResource {
     name: string;
     service: EcsService;
-    passwordSecret: aws.secretsmanager.Secret;
+    password: Password;
     constructor(name: string, args: MongoArgs, opts?: pulumi.ComponentResourceOptions);
-    private createRandomPassword;
-    private createPasswordSecret;
 }

package/dist/components/mongo.js

@@ -13,18 +13,15 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mongo = void 0;
 const pulumi = require("@pulumi/pulumi");
-const aws = require("@pulumi/aws");
-const random = require("@pulumi/random");
-const constants_1 = require("../constants");
 const ecs_service_1 = require("./ecs-service");
+const password_1 = require("./password");
 class Mongo extends pulumi.ComponentResource {
     constructor(name, args, opts = {}) {
         super('studion:Mongo', name, args, opts);
         const port = args.port || 27017;
         const { username, password, privateSubnetIds } = args, ecsServiceArgs = __rest(args, ["username", "password", "privateSubnetIds"]);
         this.name = name;
-        const mongoPassword = password || this.createRandomPassword();
-        this.passwordSecret = this.createPasswordSecret(mongoPassword);
+        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: [
                 {
                     name: 'MONGO_INITDB_ROOT_USERNAME',
@@ -33,31 +30,10 @@ class Mongo extends pulumi.ComponentResource {
             ], secrets: [
                 {
                     name: 'MONGO_INITDB_ROOT_PASSWORD',
-                    valueFrom: this.passwordSecret.arn,
+                    valueFrom: this.password.secret.arn,
                 },
             ] }), Object.assign(Object.assign({}, opts), { parent: this }));
         this.registerOutputs();
     }
-    createRandomPassword() {
-        const password = new random.RandomPassword(`${this.name}-mongo-password`, {
-            length: 16,
-            overrideSpecial: '_%$',
-            special: true,
-        });
-        return password.result;
-    }
-    createPasswordSecret(password) {
-        const project = pulumi.getProject();
-        const stack = pulumi.getStack();
-        const passwordSecret = new aws.secretsmanager.Secret(`${this.name}-password-secret`, {
-            namePrefix: `${stack}/${project}/MongoPassword-`,
-            tags: constants_1.commonTags,
-        }, { parent: this });
-        const passwordSecretValue = new aws.secretsmanager.SecretVersion(`${this.name}-password-secret-value`, {
-            secretId: passwordSecret.id,
-            secretString: password,
-        }, { parent: this, dependsOn: [passwordSecret] });
-        return passwordSecret;
-    }
 }
 exports.Mongo = Mongo;

package/dist/components/password.d.ts

@@ -0,0 +1,12 @@
+import * as aws from '@pulumi/aws';
+import * as pulumi from '@pulumi/pulumi';
+export type PasswordArgs = {
+    value?: pulumi.Input<string>;
+};
+export declare class Password extends pulumi.ComponentResource {
+    name: string;
+    value: pulumi.Output<string>;
+    secret: aws.secretsmanager.Secret;
+    constructor(name: string, args: PasswordArgs, opts?: pulumi.ComponentResourceOptions);
+    private createPasswordSecret;
+}

package/dist/components/password.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Password = void 0;
+const aws = require("@pulumi/aws");
+const pulumi = require("@pulumi/pulumi");
+const random = require("@pulumi/random");
+const constants_1 = require("../constants");
+class Password extends pulumi.ComponentResource {
+    constructor(name, args, opts = {}) {
+        const optsWithDefauls = pulumi.mergeOptions(opts, {
+            additionalSecretOutputs: ['value'],
+        });
+        super('studion:Password', name, {}, optsWithDefauls);
+        this.name = name;
+        if (args.value) {
+            this.value = pulumi.output(args.value);
+        }
+        else {
+            const password = new random.RandomPassword(`${this.name}-random-password`, {
+                length: 16,
+                overrideSpecial: '_%$',
+                special: true,
+            }, { parent: this });
+            this.value = password.result;
+        }
+        this.secret = this.createPasswordSecret(this.value);
+        this.registerOutputs();
+    }
+    createPasswordSecret(password) {
+        const project = pulumi.getProject();
+        const stack = pulumi.getStack();
+        const passwordSecret = new aws.secretsmanager.Secret(`${this.name}-password-secret`, {
+            namePrefix: `${stack}/${project}/${this.name}-`,
+            tags: constants_1.commonTags,
+        }, { parent: this });
+        const passwordSecretValue = new aws.secretsmanager.SecretVersion(`${this.name}-password-secret-value`, {
+            secretId: passwordSecret.id,
+            secretString: password,
+        }, { parent: this, dependsOn: [passwordSecret] });
+        return passwordSecret;
+    }
+}
+exports.Password = Password;

package/package.json

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