@fy-stack/database-construct 0.0.136 → 0.0.138

package/dist/lib/database-construct.d.ts

@@ -12,7 +12,7 @@ import { DatabaseConstructProps } from './types';
 export declare class DatabaseConstruct extends Construct implements Attachable, Grantable {
     secrets: secretsManager.ISecret;
     db: rds.DatabaseInstance;
-    constructor(scope: Construct, id: string, props: DatabaseConstructProps);
+    constructor(scope: Construct, id: string, { vpcId, engine, instance, public: publicDb, ...props }: DatabaseConstructProps);
     grantable(grant: IGrantable): void;
     attachable(): {
         arn: string;

package/dist/lib/database-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database-construct.d.ts","sourceRoot":"","sources":["../../src/lib/database-construct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,KAAK,cAAc,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjD;;;GAGG;AACH,qBAAa,iBACX,SAAQ,SACR,YAAW,UAAU,EAAE,SAAS;IAEzB,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC;IAChC,EAAE,EAAE,GAAG,CAAC,gBAAgB,CAAC;gBAEpB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB;IAgCvE,SAAS,CAAC,KAAK,EAAE,UAAU;IAY3B,UAAU;;;;;IAQV,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAQhD"}
+{"version":3,"file":"database-construct.d.ts","sourceRoot":"","sources":["../../src/lib/database-construct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,KAAK,cAAc,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjD;;;GAGG;AACH,qBAAa,iBACX,SAAQ,SACR,YAAW,UAAU,EAAE,SAAS;IAEzB,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC;IAChC,EAAE,EAAE,GAAG,CAAC,gBAAgB,CAAC;gBAG9B,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,EACE,KAAK,EACL,MAAM,EACN,QAAQ,EACR,MAAM,EAAE,QAAQ,EAChB,GAAG,KAAK,EACT,EAAE,sBAAsB;IAgC3B,SAAS,CAAC,KAAK,EAAE,UAAU;IAY3B,UAAU;;;;;IAQV,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAQhD"}

package/dist/lib/database-construct.js

@@ -15,21 +15,21 @@ const database_user_construct_1 = require("./database-user-construct");
 class DatabaseConstruct extends constructs_1.Construct {
     secrets;
     db;
-    constructor(scope, id, props) {
+    constructor(scope, id, { vpcId, engine, instance, public: publicDb, ...props }) {
         super(scope, id);
-        const vpc = ec2.Vpc.fromLookup(this, 'VPC', props?.vpcId ? { vpcId: props.vpcId } : { isDefault: true });
+        const vpc = ec2.Vpc.fromLookup(this, 'VPC', vpcId ? { vpcId } : { isDefault: true });
         this.db = new rds.DatabaseInstance(this, 'DB', {
             vpc,
-            engine: props?.engine ?? aws_rds_1.DatabaseInstanceEngine.POSTGRES,
-            instanceType: ec2.InstanceType.of(props?.instance?.class ?? ec2.InstanceClass.T4G, props?.instance?.size ?? ec2.InstanceSize.MICRO),
-            publiclyAccessible: props?.public,
+            engine: engine ?? aws_rds_1.DatabaseInstanceEngine.POSTGRES,
+            instanceType: ec2.InstanceType.of(instance?.class ?? ec2.InstanceClass.T4G, instance?.size ?? ec2.InstanceSize.MICRO),
+            publiclyAccessible: publicDb,
             vpcSubnets: {
-                subnetType: props?.public
+                subnetType: publicDb
                     ? ec2.SubnetType.PUBLIC
                     : ec2.SubnetType.PRIVATE_ISOLATED,
             },
+            ...props,
         });
-        this.db.addRotationSingleUser();
         if (!this.db.secret)
             throw new Error('Could not create database credentials secret');
         this.secrets = this.db.secret;

package/dist/lib/types.d.ts

@@ -3,7 +3,8 @@ import type { DatabaseInstanceProps, IInstanceEngine } from 'aws-cdk-lib/aws-rds
 /**
  * Properties required for setting up a database construct.
  */
-export type DatabaseConstructProps = {
+export type DatabaseConstructProps = Omit<DatabaseInstanceProps, 'instanceType' | 'databaseName' | 'publiclyAccessible' | 'engine' | 'vpc'> & {
+    useDefault?: boolean;
     /** Optionally pass in existing VPC id */
     vpcId?: string;
     /**
@@ -17,7 +18,5 @@ export type DatabaseConstructProps = {
     };
     /** Make database public */
     public?: boolean;
-    /** Other RDS properties {@link DatabaseInstanceProps} */
-    additionalData?: Omit<DatabaseInstanceProps, 'instanceType' | 'databaseName' | 'publiclyAccessible' | 'engine'>;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,qGAAqG;IACrG,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,aAAa,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE,CAAC;IACxD,2BAA2B;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,yDAAyD;IACzD,cAAc,CAAC,EAAE,IAAI,CACnB,qBAAqB,EACrB,cAAc,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAClE,CAAC;CACH,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACvC,qBAAqB,EACrB,cAAc,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,GAAG,KAAK,CAC1E,GAAG;IACF,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IAEzB,qGAAqG;IACrG,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,aAAa,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE,CAAC;IAExD,2BAA2B;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fy-stack/database-construct",
-  "version": "0.0.136",
+  "version": "0.0.138",
   "repository": "https://github.com/festusyuma/fy-stack",
   "dependencies": {
-    "@fy-stack/types": "0.0.136",
+    "@fy-stack/types": "0.0.138",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {