Update dbos-config setting (#116)

Companion PR for dbos-inc/dbos-transact-ts#291 Note: we still need to temporarily preserve the old fields before we officially release this breaking change. Otherwise, our tests will fail.
dbos-inc · Feb 21, 2024 · 439fd01 · 439fd01
1 parent 5480eee
commit 439fd01
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 129 deletions.
diff --git a/bank/bank-backend/dbos-config.yaml b/bank/bank-backend/dbos-config.yaml
@@ -3,10 +3,11 @@ database:
   port: 5432
   username: 'bank'
   connectionTimeoutMillis: 3000
-  user_database: 'bank'
+  app_db_name: 'bank'
+  user_database: 'bank' # Will be deprecated, use app_db_name instead
   password: ${PGPASSWORD}
-  system_database: 'dbos_bank_systemdb'
-  user_dbclient: "prisma"
+  app_db_client: "prisma"
+  user_dbclient: "prisma" # Will be deprecated, use app_db_client instead
 telemetry:
   logs:
     logLevel: 'info'

diff --git a/bank/bank-backend/dbos-test-config.yaml b/bank/bank-backend/dbos-test-config.yaml
@@ -3,10 +3,11 @@ database:
   port: 5432
   username: 'bank'
   connectionTimeoutMillis: 3000
-  user_database: 'bank'
+  app_db_name: 'bank'
+  user_database: 'bank' # Will be deprecated, use app_db_name instead
   password: ${PGPASSWORD}
-  system_database: 'dbos_bank_test_systemdb'
-  user_dbclient: "prisma"
+  app_db_client: "prisma"
+  user_dbclient: 'prisma' # Will be deprecated, use app_db_client instead
 telemetry:
   logs:
     logLevel: 'debug'

diff --git a/bank/bank-backend/package-lock.json b/bank/bank-backend/package-lock.json
diff --git a/bank/bank-backend/package.json b/bank/bank-backend/package.json
@@ -15,7 +15,7 @@
   "license": "ISC",
   "private": true,
   "dependencies": {
-    "@dbos-inc/dbos-sdk": "^0.8.62",
+    "@dbos-inc/dbos-sdk": "^0.9.17",
     "@koa/bodyparser": "^5.0.0",
     "@koa/cors": "^5.0.0",
     "@koa/router": "^12.0.0",

diff --git a/e-commerce/payment-backend/dbos-config.yaml b/e-commerce/payment-backend/dbos-config.yaml
@@ -1,12 +1,18 @@
+# To enable auto-completion and validation for this file in VSCode, install the RedHat YAML extension
+# https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml
+
+# yaml-language-server: $schema=https://raw.githubusercontent.com/dbos-inc/dbos-sdk/main/dbos-config.schema.json
+
 database:
   hostname: 'localhost'
   port: 5432
   username: 'postgres'
   password: ${PGPASSWORD}
-  user_database: 'payment'
-  system_database: 'payment_systemdb'
+  app_db_name: 'payment'
+  user_database: 'payment' # Will be deprecated, use app_db_name instead
   connectionTimeoutMillis: 3000
-  user_dbclient: 'knex'
+  app_db_client: 'knex'
+  user_dbclient: 'knex' # Will be deprecated, use app_db_client instead
   migrate: ['npx knex migrate:latest']
   rollback: ['npx knex migrate:rollback']
 runtimeConfig:

diff --git a/e-commerce/shop-backend/dbos-config.yaml b/e-commerce/shop-backend/dbos-config.yaml
@@ -1,12 +1,18 @@
+# To enable auto-completion and validation for this file in VSCode, install the RedHat YAML extension
+# https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml
+
+# yaml-language-server: $schema=https://raw.githubusercontent.com/dbos-inc/dbos-sdk/main/dbos-config.schema.json
+
 database:
   hostname: 'localhost'
   port: 5432
   username: 'postgres'
   password: ${PGPASSWORD}
-  user_database: 'shop'
-  system_database: 'shop_systemdb'
+  app_db_name: 'shop'
+  user_database: 'shop' # Will be deprecated, use app_db_name instead
   connectionTimeoutMillis: 3000
-  user_dbclient: 'knex'
+  app_db_client: 'knex'
+  user_dbclient: 'knex' # Will be deprecated, use app_db_client instead
   migrate: ['npx knex migrate:latest','npx knex seed:run']
   rollback: ['npx knex migrate:rollback']
 runtimeConfig:

diff --git a/hello-extended/dbos-config.yaml b/hello-extended/dbos-config.yaml
@@ -3,7 +3,8 @@ database:
   port: 5432
   username: 'postgres'
   password: ${PGPASSWORD}
+  app_db_name: 'hello'
   user_database: 'hello'
-  system_database: 'hello_systemdb'
   connectionTimeoutMillis: 3000
-  user_dbclient: 'knex'
+  app_db_client: 'knex'
+  user_dbclient: 'knex'
diff --git a/hello-prisma/dbos-config.yaml b/hello-prisma/dbos-config.yaml
@@ -2,7 +2,9 @@ database:
   hostname: 'localhost'
   port: 5432
   username: 'postgres'
+  app_db_name: 'helloprisma'
   user_database: 'helloprisma'
   password: ${PGPASSWORD}
   connectionTimeoutMillis: 3000
-  user_dbclient: "prisma"
+  app_db_client: "prisma"
+  user_dbclient: 'prisma'
diff --git a/hello-typeorm/dbos-config.yaml b/hello-typeorm/dbos-config.yaml
@@ -2,7 +2,9 @@ database:
   hostname: 'localhost'
   port: 5432
   username: 'postgres'
+  app_db_name: 'hellotypeorm'
   user_database: 'hellotypeorm'
   password: ${PGPASSWORD}
   connectionTimeoutMillis: 3000
+  app_db_client: "typeorm"
   user_dbclient: "typeorm"
diff --git a/tpcc/dbos-config.yaml b/tpcc/dbos-config.yaml
@@ -8,8 +8,10 @@ database:
   port: 5432
   username: 'postgres'
   password: ${PGPASSWORD}
-  user_database: 'tpcc'
+  user_database: 'tpcc' # Will be deprecated, use app_db_name instead
+  app_db_name: 'tpcc'
   connectionTimeoutMillis: 3000
-  user_dbclient: 'knex'
+  user_dbclient: 'knex' # Will be deprecated, use app_db_client instead
+  app_db_client: 'knex'
   migrate: ['npx knex migrate:latest']
   rollback: ['npx knex migrate:rollback']
diff --git a/yky-social/dbos-config.yaml b/yky-social/dbos-config.yaml
@@ -3,9 +3,10 @@ database:
   port: ${POSTGRES_PORT}
   username: ${POSTGRES_USERNAME}
   password: ${POSTGRES_PASSWORD}
+  app_db_name: ${POSTGRES_DATABASE}
   user_database: ${POSTGRES_DATABASE}
-  system_database: 'opsys'
   connectionTimeoutMillis: 3000
+  app_db_client: 'typeorm'
   user_dbclient: 'typeorm'
 telemetry:
   logs: