@studion/infra-code-blocks 0.1.8 → 0.2.0

package/README.md

@@ -4,9 +4,15 @@ Studion Platform common infra components.
 
 ## Table of Contents
 
-1. [Installation](#installation)
-2. [Usage](#usage)
-3. [API](#api)
+1. [Prerequisites](#prerequisites)
+2. [Installation](#installation)
+3. [Usage](#usage)
+4. [API](#api)
+
+## 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
 
 ## Installation
 
@@ -42,6 +48,12 @@ const project = new studion.Project('demo-project', {
 export const projectName = project.name;
 ```
 
+- Deploy pulumi stack
+
+```bash
+$ pulumi up
+```
+
 ## API
 
 1. [Project](#project)
@@ -49,6 +61,9 @@ export const projectName = project.name;
 3. [Redis](#redis)
 4. [StaticSite](#static-site)
 5. [WebServer](#web-server)
+6. [Nuxt SSR](#nuxt-ssr-preset)
+7. [Mongo](#mongo)
+8. [EcsService](#ecs-service)
 
 ### Project
 
@@ -70,12 +85,14 @@ new Project(name: string, args: ProjectArgs, opts?: pulumi.CustomResourceOptions
 ```ts
 type ProjectArgs = {
   services: (
-    | DatabaseService
-    | RedisService
-    | StaticSiteService
-    | WebServerService
+    | DatabaseServiceOptions
+    | RedisServiceOptions
+    | StaticSiteServiceOptions
+    | WebServerServiceOptions
+    | NuxtSSRServiceOptions
+    | MongoServiceOptions
+    | EcsServiceOptions
   )[];
-  hostedZoneId?: pulumi.Input<string>;
   enableSSMConnect?: pulumi.Input<boolean>;
 };
 ```
@@ -83,16 +100,15 @@ type ProjectArgs = {
 | Argument         |                                                                         Description                                                                          |
 | :--------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------: |
 | services \*      |                                                                        Service list.                                                                         |
-| hostedZoneId     |                                           Route53 hosted zone ID responsible for managing records for the domain.                                            |
 | 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. |
 
 ```ts
-type DatabaseService = {
+type DatabaseServiceOptions = {
   type: 'DATABASE';
   serviceName: string;
   dbName: pulumi.Input<string>;
   username: pulumi.Input<string>;
-  password: pulumi.Input<string>;
+  password?: pulumi.Input<string>;
   applyImmediately?: pulumi.Input<boolean>;
   skipFinalSnapshot?: pulumi.Input<boolean>;
   allocatedStorage?: pulumi.Input<number>;
@@ -105,7 +121,7 @@ type DatabaseService = {
 ```
 
 ```ts
-export type RedisService = {
+export type RedisServiceOptions = {
   type: 'REDIS';
   serviceName: string;
   dbName: pulumi.Input<string>;
@@ -114,10 +130,11 @@ export type RedisService = {
 ```
 
 ```ts
-export type StaticSiteService = {
+export type StaticSiteServiceOptions = {
   type: 'STATIC_SITE';
   serviceName: string;
-  domain: pulumi.Input<string>;
+  domain?: pulumi.Input<string>;
+  hostedZoneId?: pulumi.Input<string>;
   tags?: pulumi.Input<{
     [key: string]: pulumi.Input<string>;
   }>;
@@ -125,21 +142,103 @@ export type StaticSiteService = {
 ```
 
 ```ts
-export type WebServerService = {
+export type WebServerServiceOptions = {
   type: 'WEB_SERVER';
   serviceName: string;
+  image: pulumi.Input<string>;
+  port: pulumi.Input<number>;
+  domain?: pulumi.Input<string>;
+  hostedZoneId?: pulumi.Input<string>;
+  environment?:
+    | aws.ecs.KeyValuePair[]
+    | ((services: Services) => aws.ecs.KeyValuePair[]);
+  secrets?: aws.ecs.Secret[] | ((services: Services) => aws.ecs.Secret[]);
+  desiredCount?: pulumi.Input<number>;
+  autoscaling?: pulumi.Input<{
+    enabled: pulumi.Input<boolean>;
+    minCount?: pulumi.Input<number>;
+    maxCount?: pulumi.Input<number>;
+  }>;
+  size?: pulumi.Input<Size>;
+  healthCheckPath?: pulumi.Input<string>;
+  taskExecutionRoleInlinePolicies?: pulumi.Input<
+    pulumi.Input<RoleInlinePolicy>[]
+  >;
+  taskRoleInlinePolicies?: pulumi.Input<pulumi.Input<RoleInlinePolicy>[]>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
+};
+```
+
+```ts
+export type NuxtSSRServiceOptions = {
+  type: 'NUXT_SSR';
+  serviceName: string;
+  image: pulumi.Input<string>;
+  port: pulumi.Input<number>;
+  domain?: pulumi.Input<string>;
+  hostedZoneId?: pulumi.Input<string>;
   environment?:
     | aws.ecs.KeyValuePair[]
     | ((services: Services) => aws.ecs.KeyValuePair[]);
   secrets?: aws.ecs.Secret[] | ((services: Services) => aws.ecs.Secret[]);
+  desiredCount?: pulumi.Input<number>;
+  autoscaling?: pulumi.Input<{
+    enabled: pulumi.Input<boolean>;
+    minCount?: pulumi.Input<number>;
+    maxCount?: pulumi.Input<number>;
+  }>;
+  size?: pulumi.Input<Size>;
+  healthCheckPath?: pulumi.Input<string>;
+  taskExecutionRoleInlinePolicies?: pulumi.Input<
+    pulumi.Input<RoleInlinePolicy>[]
+  >;
+  taskRoleInlinePolicies?: pulumi.Input<pulumi.Input<RoleInlinePolicy>[]>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
+};
+```
+
+```ts
+type MongoServiceOptions = {
+  type: 'MONGO';
+  serviceName: string;
+  username: pulumi.Input<string>;
+  password?: pulumi.Input<string>;
+  port?: pulumi.Input<number>;
+  size?: pulumi.Input<Size>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
+};
+```
+
+```ts
+type EcsServiceOptions = {
+  type: 'ECS_SERVICE';
+  serviceName: string;
   image: pulumi.Input<string>;
   port: pulumi.Input<number>;
-  domain: pulumi.Input<string>;
+  enableServiceAutoDiscovery: pulumi.Input<boolean>;
+  lbTargetGroupArn?: aws.lb.TargetGroup['arn'];
+  persistentStorageVolumePath?: pulumi.Input<string>;
+  securityGroup?: aws.ec2.SecurityGroup;
+  assignPublicIp?: pulumi.Input<boolean>;
+  dockerCommand?: pulumi.Input<string[]>;
+  environment?:
+    | aws.ecs.KeyValuePair[]
+    | ((services: Services) => aws.ecs.KeyValuePair[]);
+  secrets?: aws.ecs.Secret[] | ((services: Services) => aws.ecs.Secret[]);
   desiredCount?: pulumi.Input<number>;
-  minCount?: pulumi.Input<number>;
-  maxCount?: pulumi.Input<number>;
+  autoscaling?: pulumi.Input<{
+    enabled: pulumi.Input<boolean>;
+    minCount?: pulumi.Input<number>;
+    maxCount?: pulumi.Input<number>;
+  }>;
   size?: pulumi.Input<Size>;
-  healtCheckPath?: pulumi.Input<string>;
+  healthCheckPath?: pulumi.Input<string>;
   taskExecutionRoleInlinePolicies?: pulumi.Input<
     pulumi.Input<RoleInlinePolicy>[]
   >;
@@ -156,7 +255,6 @@ recieves services bag as argument.
 
 ```ts
 const project = new studion.Project('demo-project', {
-  environment: 'DEVELOPMENT',
   services: [
     {
       type: 'REDIS',
@@ -169,6 +267,7 @@ const project = new studion.Project('demo-project', {
       image: imageUri,
       port: 3000,
       domain: 'api.my-domain.com',
+      hostedZoneId: 'my-domain.com-hostedZoneId',
       environment: (services: Services) => {
         const redisServiceName = 'redis';
         const redis = services[redisServiceName];
@@ -187,7 +286,6 @@ Secret Manager based on arn that is provided for the `valueFrom` field.
 
 ```ts
 const project = new studion.Project('demo-project', {
-  environment: 'DEVELOPMENT',
   services: [
     {
       type: 'WEB_SERVER',
@@ -195,6 +293,7 @@ const project = new studion.Project('demo-project', {
       image: imageUri,
       port: 3000,
       domain: 'api.my-domain.com',
+      hostedZoneId: 'my-domain.com-hostedZoneId',
       secrets: [
         { name: 'DB_PASSWORD', valueFrom: 'arn-of-the-secret-manager-secret' },
       ],
@@ -205,7 +304,6 @@ const project = new studion.Project('demo-project', {
 
 ```ts
 const project = new studion.Project('demo-project', {
-  environment: 'DEVELOPMENT',
   services: [
     {
       type: 'REDIS',
@@ -218,6 +316,7 @@ const project = new studion.Project('demo-project', {
       image: imageUri,
       port: 3000,
       domain: 'api.my-domain.com',
+      hostedZoneId: 'my-domain.com-hostedZoneId',
       secrets: (services: Services) => {
         const redisServiceName = 'redis';
         const redis = services[redisServiceName];
@@ -256,8 +355,10 @@ new Database(name: string, args: DatabaseArgs, opts?: pulumi.CustomResourceOptio
 type DatabaseArgs = {
   dbName: pulumi.Input<string>;
   username: pulumi.Input<string>;
-  password: pulumi.Input<string>;
-  vpc: awsx.ec2.Vpc;
+  vpcId: pulumi.Input<string>;
+  isolatedSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
+  vpcCidrBlock: pulumi.Input<string>;
+  password?: pulumi.Input<string>;
   applyImmediately?: pulumi.Input<boolean>;
   skipFinalSnapshot?: pulumi.Input<boolean>;
   allocatedStorage?: pulumi.Input<number>;
@@ -269,6 +370,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`.
 
@@ -318,7 +420,7 @@ will exist on the resource.
 
 ### Static Site
 
-AWS S3 + Cloudfront static site.
+AWS S3 + Cloudfront.
 
 Features:
 
@@ -341,8 +443,8 @@ new StaticSite(name: string, args: StaticSiteArgs, opts?: pulumi.ComponentResour
 
 ```ts
 type StaticSiteArgs = {
-  domain: pulumi.Input<string>;
-  hostedZoneId: pulumi.Input<string>;
+  domain?: pulumi.Input<string>;
+  hostedZoneId?: pulumi.Input<string>;
   tags?: pulumi.Input<{
     [key: string]: pulumi.Input<string>;
   }>;
@@ -351,11 +453,11 @@ type StaticSiteArgs = {
 
 ### Web Server
 
-AWS ECS Fargate web server.
+AWS ECS Fargate.
 
 Features:
 
-- Memory and CPU autoscaling enabled
+- memory and CPU autoscaling enabled
 - creates TLS certificate for the specified domain
 - redirects HTTP traffic to HTTPS
 - creates CloudWatch log group
@@ -377,17 +479,173 @@ new WebServer(name: string, args: WebServerArgs, opts?: pulumi.ComponentResource
 export type WebServerArgs = {
   image: pulumi.Input<string>;
   port: pulumi.Input<number>;
-  domain: pulumi.Input<string>;
   cluster: aws.ecs.Cluster;
-  hostedZoneId: pulumi.Input<string>;
-  vpc: awsx.ec2.Vpc;
+  vpcId: pulumi.Input<string>;
+  vpcCidrBlock: pulumi.Input<string>;
+  publicSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
+  domain?: pulumi.Input<string>;
+  hostedZoneId?: pulumi.Input<string>;
   desiredCount?: pulumi.Input<number>;
-  minCount?: pulumi.Input<number>;
-  maxCount?: pulumi.Input<number>;
+  autoscaling?: pulumi.Input<{
+    enabled: pulumi.Input<boolean>;
+    minCount?: pulumi.Input<number>;
+    maxCount?: pulumi.Input<number>;
+  }>;
+  size?: pulumi.Input<Size>;
+  environment?: aws.ecs.KeyValuePair[];
+  secrets?: aws.ecs.Secret[];
+  healthCheckPath?: pulumi.Input<string>;
+  taskExecutionRoleInlinePolicies?: pulumi.Input<
+    pulumi.Input<RoleInlinePolicy>[]
+  >;
+  taskRoleInlinePolicies?: pulumi.Input<pulumi.Input<RoleInlinePolicy>[]>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
+};
+```
+
+### Nuxt SSR preset
+
+AWS ECS Fargate + Cloudfront.
+
+Features:
+
+- memory and CPU autoscaling enabled
+- 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`
+- CDN in front of the application load balancer for static resource caching
+
+<br>
+
+```ts
+new NuxtSSR(name: string, args: NuxtSSRArgs, opts?: pulumi.ComponentResourceOptions );
+```
+
+| Argument |                  Description                   |
+| :------- | :--------------------------------------------: |
+| name \*  |        The unique name of the resource.        |
+| args \*  |     The arguments to resource properties.      |
+| opts     | Bag of options to control resource's behavior. |
+
+```ts
+export type NuxtSSRArgs = {
+  image: pulumi.Input<string>;
+  port: pulumi.Input<number>;
+  cluster: aws.ecs.Cluster;
+  vpcId: pulumi.Input<string>;
+  vpcCidrBlock: pulumi.Input<string>;
+  publicSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
+  domain?: pulumi.Input<string>;
+  hostedZoneId?: pulumi.Input<string>;
+  desiredCount?: pulumi.Input<number>;
+  autoscaling?: pulumi.Input<{
+    enabled: pulumi.Input<boolean>;
+    minCount?: pulumi.Input<number>;
+    maxCount?: pulumi.Input<number>;
+  }>;
+  size?: pulumi.Input<Size>;
+  environment?: aws.ecs.KeyValuePair[];
+  secrets?: aws.ecs.Secret[];
+  healthCheckPath?: pulumi.Input<string>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
+};
+```
+
+### Mongo
+
+AWS ECS Fargate.
+
+Features:
+
+- persistent storage
+- service auto-discovery
+- creates CloudWatch log group
+- comes with predefined cpu and memory options: `small`, `medium`, `large`, `xlarge`
+
+<br>
+
+```ts
+new Mongo(name: string, args: MongoArgs, opts?: pulumi.ComponentResourceOptions );
+```
+
+| Argument |                  Description                   |
+| :------- | :--------------------------------------------: |
+| name \*  |        The unique name of the resource.        |
+| args \*  |     The arguments to resource properties.      |
+| opts     | Bag of options to control resource's behavior. |
+
+```ts
+export type MongoArgs = {
+  cluster: aws.ecs.Cluster;
+  vpcId: pulumi.Input<string>;
+  vpcCidrBlock: pulumi.Input<string>;
+  privateSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
+  username: pulumi.Input<string>;
+  password?: pulumi.Input<string>;
+  port?: pulumi.Input<number>;
+  size?: pulumi.Input<Size>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
+};
+```
+
+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`.
+
+### Ecs Service
+
+AWS ECS Fargate.
+
+Features:
+
+- memory and CPU autoscaling
+- service auto discovery
+- persistent storage
+- CloudWatch logs
+- comes with predefined cpu and memory options: `small`, `medium`, `large`, `xlarge`
+
+<br>
+
+```ts
+new EcsService(name: string, args: EcsServiceArgs, opts?: pulumi.ComponentResourceOptions );
+```
+
+| Argument |                  Description                   |
+| :------- | :--------------------------------------------: |
+| name \*  |        The unique name of the resource.        |
+| args \*  |     The arguments to resource properties.      |
+| opts     | Bag of options to control resource's behavior. |
+
+```ts
+export type EcsServiceArgs = {
+  image: pulumi.Input<string>;
+  port: pulumi.Input<number>;
+  cluster: aws.ecs.Cluster;
+  vpcId: pulumi.Input<string>;
+  vpcCidrBlock: pulumi.Input<string>;
+  subnetIds: pulumi.Input<pulumi.Input<string>[]>;
+  desiredCount?: pulumi.Input<number>;
+  autoscaling?: pulumi.Input<{
+    enabled: pulumi.Input<boolean>;
+    minCount?: pulumi.Input<number>;
+    maxCount?: pulumi.Input<number>;
+  }>;
   size?: pulumi.Input<Size>;
   environment?: aws.ecs.KeyValuePair[];
   secrets?: aws.ecs.Secret[];
-  healtCheckPath?: pulumi.Input<string>;
+  enableServiceAutoDiscovery: pulumi.Input<boolean>;
+  persistentStorageVolumePath?: pulumi.Input<string>;
+  dockerCommand?: pulumi.Input<string[]>;
+  lbTargetGroupArn?: aws.lb.TargetGroup['arn'];
+  securityGroup?: aws.ec2.SecurityGroup;
+  assignPublicIp?: pulumi.Input<boolean>;
   taskExecutionRoleInlinePolicies?: pulumi.Input<
     pulumi.Input<RoleInlinePolicy>[]
   >;
@@ -499,5 +757,4 @@ const project = new studion.Project('demo-project', {
 ## 🚧 TODO
 
 - [ ] Add worker service for executing tasks
-- [ ] Add MongoDB service
 - [ ] Enable RDS password rotation

package/dist/components/database.d.ts

@@ -1,5 +1,4 @@
 import * as aws from '@pulumi/aws';
-import * as awsx from '@pulumi/awsx';
 import * as pulumi from '@pulumi/pulumi';
 export type DatabaseArgs = {
     /**
@@ -10,33 +9,38 @@ export type DatabaseArgs = {
      * Username for the master DB user.
      */
     username: pulumi.Input<string>;
+    vpcId: pulumi.Input<string>;
+    isolatedSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
     /**
-     * Password for the master DB user.
-     * The value will be stored as a secret in AWS Secret Manager.
+     * The IPv4 CIDR block for the VPC.
      */
-    password: pulumi.Input<string>;
+    vpcCidrBlock: pulumi.Input<string>;
     /**
-     * The awsx.ec2.Vpc resource.
+     * 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.
      */
-    vpc: awsx.ec2.Vpc;
+    password?: pulumi.Input<string>;
     /**
-     * Specifies whether any database modifications are applied immediately, or during the next maintenance window. Default is false.
+     * Specifies whether any database modifications are applied immediately,
+     * or during the next maintenance window. Default is false.
      */
     applyImmediately?: pulumi.Input<boolean>;
     /**
-     * Determines whether a final DB snapshot is created before the DB instance is deleted.
+     * Determines whether a final DB snapshot is created before the DB
+     * instance is deleted. Defaults to false.
      */
     skipFinalSnapshot?: pulumi.Input<boolean>;
     /**
-     * The allocated storage in gibibytes.
+     * The allocated storage in gibibytes. Defaults to 20GB.
      */
     allocatedStorage?: pulumi.Input<number>;
     /**
-     * The upper limit to which Amazon RDS can automatically scale the storage of the DB instance.
+     * The upper limit to which Amazon RDS can automatically scale
+     * the storage of the DB instance. Defaults to 100GB.
      */
     maxAllocatedStorage?: pulumi.Input<number>;
     /**
-     * The instance type of the RDS instance.
+     * The instance type of the RDS instance. Defaults to 'db.t4g.micro'.
      */
     instanceClass?: pulumi.Input<string>;
     /**

package/dist/components/database.js

@@ -3,6 +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 constants_1 = require("../constants");
 const defaults = {
     applyImmediately: false,
@@ -15,30 +16,31 @@ class Database extends pulumi.ComponentResource {
     constructor(name, args, opts = {}) {
         super('studion:Database', name, {}, opts);
         this.name = name;
-        const { vpc, password } = args;
-        this.dbSubnetGroup = this.createSubnetGroup({ vpc });
-        this.dbSecurityGroup = this.createSecurityGroup({ vpc });
+        const { vpcId, isolatedSubnetIds, vpcCidrBlock } = args;
+        this.dbSubnetGroup = this.createSubnetGroup({ isolatedSubnetIds });
+        this.dbSecurityGroup = this.createSecurityGroup({ vpcId, vpcCidrBlock });
         this.kms = this.createEncryptionKey();
-        this.passwordSecret = this.createPasswordSecret({ password });
-        this.instance = this.createDatabaseInstance(args);
+        const { instance, passwordSecret } = this.createDatabaseInstance(args);
+        this.instance = instance;
+        this.passwordSecret = passwordSecret;
         this.registerOutputs();
     }
-    createSubnetGroup({ vpc }) {
+    createSubnetGroup({ isolatedSubnetIds, }) {
         const dbSubnetGroup = new aws.rds.SubnetGroup(`${this.name}-subnet-group`, {
-            subnetIds: vpc.isolatedSubnetIds,
+            subnetIds: isolatedSubnetIds,
             tags: constants_1.commonTags,
         }, { parent: this });
         return dbSubnetGroup;
     }
-    createSecurityGroup({ vpc }) {
+    createSecurityGroup({ vpcId, vpcCidrBlock, }) {
         const dbSecurityGroup = new aws.ec2.SecurityGroup(`${this.name}-security-group`, {
-            vpcId: vpc.vpcId,
+            vpcId,
             ingress: [
                 {
                     protocol: 'tcp',
                     fromPort: 5432,
                     toPort: 5432,
-                    cidrBlocks: [vpc.vpc.cidrBlock],
+                    cidrBlocks: [vpcCidrBlock],
                 },
             ],
             tags: constants_1.commonTags,
@@ -73,16 +75,23 @@ class Database extends pulumi.ComponentResource {
     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',
-            engineVersion: '14.9',
+            engineVersion: '15.3',
             allocatedStorage: argsWithDefaults.allocatedStorage,
             maxAllocatedStorage: argsWithDefaults.maxAllocatedStorage,
             instanceClass: argsWithDefaults.instanceClass,
             dbName: argsWithDefaults.dbName,
             username: argsWithDefaults.username,
-            password: argsWithDefaults.password,
+            password,
             dbSubnetGroupName: this.dbSubnetGroup.name,
             vpcSecurityGroupIds: [this.dbSecurityGroup.id],
             storageEncrypted: true,
@@ -97,7 +106,7 @@ class Database extends pulumi.ComponentResource {
             backupRetentionPeriod: 14,
             tags: Object.assign(Object.assign({}, constants_1.commonTags), argsWithDefaults.tags),
         }, { parent: this });
-        return instance;
+        return { instance, passwordSecret };
     }
 }
 exports.Database = Database;

package/dist/components/ec2-ssm-connect.d.ts

@@ -1,8 +1,12 @@
 import * as pulumi from '@pulumi/pulumi';
 import * as aws from '@pulumi/aws';
-import * as awsx from '@pulumi/awsx';
 export type Ec2SSMConnectArgs = {
-    vpc: awsx.ec2.Vpc;
+    vpcId: pulumi.Input<string>;
+    privateSubnetId: pulumi.Input<string>;
+    /**
+     * The IPv4 CIDR block for the VPC.
+     */
+    vpcCidrBlock: pulumi.Input<string>;
     tags?: pulumi.Input<{
         [key: string]: pulumi.Input<string>;
     }>;