From ce75c177dda7a4c15293ff743f70f603e929ad54 Mon Sep 17 00:00:00 2001
From: mandryllo <frano.sincic@gostudion.com>
Date: Wed, 17 Dec 2025 15:20:51 +0100
Subject: [PATCH 1/4] Expose db v2 components

---
 src/v2/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/v2/index.ts b/src/v2/index.ts
index aaaabc7..2f4fdda 100644
--- a/src/v2/index.ts
+++ b/src/v2/index.ts
@@ -5,7 +5,9 @@ export { WebServerLoadBalancer } from './components/web-server/load-balancer';
 export { ElastiCacheRedis } from './components/redis/elasticache-redis';
 export { UpstashRedis } from './components/redis/upstash-redis';
 export { Vpc } from './components/vpc';
-
+export { Database } from './components/database';
+export { DatabaseBuilder } from './components/database/builder';
+ 
 import { OtelCollectorBuilder } from './otel/builder';
 import { OtelCollector } from './otel';
 export const openTelemetry = { OtelCollector, OtelCollectorBuilder };

From 5793118e069d623f7f62faf66dcf5fd9b3d5f6c9 Mon Sep 17 00:00:00 2001
From: mandryllo <frano.sincic@gostudion.com>
Date: Wed, 17 Dec 2025 15:20:58 +0100
Subject: [PATCH 2/4] Fix type tests

---
 tests/build/index.tst.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/build/index.tst.ts b/tests/build/index.tst.ts
index 395deda..9442ff3 100644
--- a/tests/build/index.tst.ts
+++ b/tests/build/index.tst.ts
@@ -4,8 +4,6 @@ import { describe, expect, it } from 'tstyche';
 import { next as studion } from '@studion/infra-code-blocks';
 import { OtelCollector } from '../../dist/v2/otel';
 import { OtelCollectorBuilder } from '../../dist/v2/otel/builder';
-import { Database } from '../../dist/v2/components/database';
-import { DatabaseBuilder } from '../../dist/v2/components/database/builder';
 
 describe('Build output', () => {
   describe('ECS Service', () => {
@@ -262,11 +260,13 @@ describe('Build output', () => {
   });
 
   describe('Database', () => {
-    it.skip('should export Database', () => {
+    const { Database, DatabaseBuilder } = studion;
+
+    it('should export Database', () => {
       expect(studion).type.toHaveProperty('Database');
     });
 
-    it.skip('should export DatabaseBuilder', () => {
+    it('should export DatabaseBuilder', () => {
       expect(studion).type.toHaveProperty('DatabaseBuilder');
     });
 

From da2498d15779264b452cda1b3f74877cc3089f0c Mon Sep 17 00:00:00 2001
From: mandryllo <frano.sincic@gostudion.com>
Date: Wed, 17 Dec 2025 15:21:54 +0100
Subject: [PATCH 3/4] Fix integration tests

---
 tests/database/infrastructure/index.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/database/infrastructure/index.ts b/tests/database/infrastructure/index.ts
index 85d15bb..0e5e876 100644
--- a/tests/database/infrastructure/index.ts
+++ b/tests/database/infrastructure/index.ts
@@ -1,11 +1,10 @@
 import * as aws from '@pulumi/aws';
 import { next as studion } from '@studion/infra-code-blocks';
-import { DatabaseBuilder } from '../../../dist/v2/components/database/builder';
 import * as config from './config';
 
 const vpc = new studion.Vpc(`${config.appName}-vpc`, {});
 
-const defaultDb = new DatabaseBuilder(`${config.appName}-default-db`)
+const defaultDb = new studion.DatabaseBuilder(`${config.appName}-default-db`)
   .withInstance({
     dbName: config.dbName,
   })
@@ -33,7 +32,7 @@ const paramGroup = new aws.rds.ParameterGroup(
   },
 );
 
-const customDb = new DatabaseBuilder(`${config.appName}-custom-db`)
+const customDb = new studion.DatabaseBuilder(`${config.appName}-custom-db`)
   .withInstance({
     dbName: config.dbName,
     applyImmediately: config.applyImmediately,
@@ -68,7 +67,7 @@ const snapshot = defaultDb.instance.dbInstanceIdentifier.apply(
 
 const snapshotDb = snapshot.apply(snapshot => {
   if (!snapshot) return;
-  return new DatabaseBuilder(`${config.appName}-snapshot-db`)
+  return new studion.DatabaseBuilder(`${config.appName}-snapshot-db`)
     .withInstance({
       applyImmediately: true,
     })

From 0d3e3f4a76b35ebea71020302c0c3cc8a7fd7151 Mon Sep 17 00:00:00 2001
From: mandryllo <frano.sincic@gostudion.com>
Date: Wed, 17 Dec 2025 15:22:29 +0100
Subject: [PATCH 4/4] Fix formating

---
 src/v2/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v2/index.ts b/src/v2/index.ts
index 2f4fdda..cc2a848 100644
--- a/src/v2/index.ts
+++ b/src/v2/index.ts
@@ -7,7 +7,7 @@ export { UpstashRedis } from './components/redis/upstash-redis';
 export { Vpc } from './components/vpc';
 export { Database } from './components/database';
 export { DatabaseBuilder } from './components/database/builder';
- 
+
 import { OtelCollectorBuilder } from './otel/builder';
 import { OtelCollector } from './otel';
 export const openTelemetry = { OtelCollector, OtelCollectorBuilder };