Link Applications and Databases (#224)

Companion PR for dbos-inc/dbos-cloud#145

src/cloud-cli/applications/index.ts

@@ -3,6 +3,5 @@ export { listApps } from './list-apps';
 export { deleteApp } from './delete-app';
 export { deployAppCode } from './deploy-app-code';
 export { getAppLogs } from './get-app-logs';
-export { configureApp } from './configure'
 export { updateApp } from './update-app';
 

src/cloud-cli/applications/list-apps.ts

@@ -24,8 +24,7 @@ export async function listApps(host: string, port: string): Promise<number> {
     }
     const formattedData: Application[] = []
     for (const application of data) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-      formattedData.push({ "Name": application.Name, "ID": application.ID, "Status": application.Status, "MaxVMs": application.MaxVMs });
+      formattedData.push({ "Name": application.Name, "ID": application.ID, "Version": application.Version, "DatabaseName": application.DatabaseName, "MaxVMs": application.MaxVMs });
     }
     console.log(JSON.stringify(formattedData));
     return 0;

src/cloud-cli/applications/register-app.ts

@@ -2,7 +2,7 @@ import axios from "axios";
 import { GlobalLogger } from "../../telemetry/logs";
 import { getCloudCredentials } from "../utils";
 
-export async function registerApp(appName: string, host: string, port: string, machines: number): Promise<number> {
+export async function registerApp(appName: string, dbname: string, host: string,  port: string, machines: number): Promise<number> {
   const logger = new GlobalLogger();
   const userCredentials = getCloudCredentials();
   const bearerToken = "Bearer " + userCredentials.token;
@@ -12,7 +12,8 @@ export async function registerApp(appName: string, host: string, port: string, m
       `http://${host}:${port}/${userCredentials.userName}/application`,
       {
         name: appName,
-        max_vms: machines
+        database: dbname,
+        max_vms: machines,
       },
       {
         headers: {

src/cloud-cli/applications/types.ts

@@ -1,6 +1,7 @@
 export type Application = {
   Name: string;
   ID: string;
-  Status: string;
+  DatabaseName: string;
+  Version: string;
   MaxVMs: string;
 };

src/cloud-cli/applications/update-app.ts

@@ -25,7 +25,7 @@ export async function updateApp(appName: string, host: string, port: string, mac
     );
     const application: Application = update.data as Application;
     logger.info(`Successfully updated: ${application.Name}`);
-    console.log(JSON.stringify({ "Name": application.Name, "ID": application.ID, "Status": application.Status, "MaxVMs": application.MaxVMs }));
+    console.log(JSON.stringify({ "Name": application.Name, "ID": application.ID, "Version": application.Version, "MaxVMs": application.MaxVMs }));
     return 0;
   } catch (e) {
     if (axios.isAxiosError(e) && e.response) {

src/cloud-cli/cli.ts

@@ -7,7 +7,6 @@ import {
   deleteApp,
   deployAppCode,
   getAppLogs,
-  configureApp,
 } from "./applications/";
 import { Command } from 'commander';
 import { login } from "./login";
@@ -69,10 +68,11 @@ applicationCommands
   .command('register')
   .description('Register a new application')
   .requiredOption('-n, --name <string>', 'Specify the app name')
+  .requiredOption('-d, --database <string>', 'Specify the app database name')
   .option('-m, --machines <string>', 'Number of VMs to deploy', '1')
-  .action(async (options: { name: string, machines: string }) => {
+  .action(async (options: { name: string, database: string, machines: string }) => {
     const { host, port }: { host: string, port: string } = applicationCommands.opts()
-    const exitCode = await registerApp(options.name, host, port, parseInt(options.machines));
+    const exitCode = await registerApp(options.name, options.database, host, port, parseInt(options.machines));
     process.exit(exitCode);
   });
 
@@ -126,17 +126,6 @@ applicationCommands
     process.exit(exitCode);
   });
 
-
-applicationCommands
-  .command('configure')
-  .description('Configure an application to be deployed')
-  .option('-d, --dbname <string>', 'Specify the name of an already setup RDS user databases')
-  .action(async (options: { dbname: string }) => {
-    const { host, port }: { host: string, port: string } = applicationCommands.opts()
-    const exitCode = await configureApp(host, port, options.dbname);
-    process.exit(exitCode);
-  });
-
 //////////////////////////////
 /* USER DATABASE MANAGEMENT */
 //////////////////////////////
@@ -150,8 +139,8 @@ const userdbCommands = program
 userdbCommands
   .command('create')
   .argument('<string>', 'database name')
-  .option('-a, --admin <string>', 'Specify the admin user', 'postgres')
-  .option('-W, --password <string>', 'Specify the admin password', 'postgres')
+  .requiredOption('-a, --admin <string>', 'Specify the admin user')
+  .requiredOption('-W, --password <string>', 'Specify the admin password')
   .option('-s, --sync', 'make synchronous call', true)
   .action((async (dbname: string, options: { admin: string, password: string, sync: boolean }) => {
     const { host, port }: { host: string, port: string } = userdbCommands.opts()

src/cloud-cli/userdb.ts

@@ -8,7 +8,6 @@ import { UserDatabaseName } from "../user_database";
 
 export interface UserDBInstance {
   readonly DBName: string,
-  readonly UserID: string,
   readonly Status: string,
   readonly HostName: string,
   readonly Port: number,

src/dbos-runtime/config.ts

@@ -18,12 +18,11 @@ export interface ConfigFile {
     port: number;
     username: string;
     password?: string;
-    connectionTimeoutMillis: number;
+    connectionTimeoutMillis?: number;
     user_database: string;
-    system_database: string;
+    system_database?: string;
     ssl_ca?: string;
-    observability_database: string;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    observability_database?: string;
     user_dbclient?: UserDatabaseName;
     migrate?: string[];
     rollback?: string[];