Merge pull request #1819 from Genez-io/release_v3_2_9

andreia-oca · web-flow · commit a9dbab2470f7 · 2025-05-07T12:47:10.000+03:00
Release v3.2.9
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -19,6 +19,7 @@ updates:
           - dependency-name: "esbuild"
             versions: [">= 0.18.0"]
           - dependency-name: "tree-sitter"
+          - dependency-name: "express"
     - package-ecosystem: "gitsubmodule"
       target-branch: "main"
       directory: "/"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "genezio",
-    "version": "3.2.8",
+    "version": "3.2.9",
     "description": "Command line utility to interact with Genezio infrastructure.",
     "exports": "./index.js",
     "type": "module",
@@ -78,7 +78,7 @@
         "esbuild": "^0.18.20",
         "esbuild-node-externals": "^1.18.0",
         "execa": "^9.4.0",
-        "express": "^5.1.0",
+        "express": "^4.19.2",
         "fs-extra": "^11.3.0",
         "glob": "^8.0.3",
         "hash-it": "^6.0.0",
diff --git a/src/commands/database.ts b/src/commands/database.ts
@@ -0,0 +1,63 @@
+import { UserError } from "../errors.js";
+import { GenezioDatabaseOptions } from "../models/commandOptions.js";
+import { log } from "../utils/logging.js";
+import { createDatabase, getConnectionUrl, listDatabases } from "../requests/database.js";
+import { YamlConfigurationIOController } from "../projectConfiguration/yaml/v2.js";
+import { CreateDatabaseRequest } from "../models/requests.js";
+import { DatabaseType } from "../projectConfiguration/yaml/models.js";
+
+export async function listDatabasesCmd(_: GenezioDatabaseOptions) {
+    const response = await listDatabases();
+    if (!response) {
+        throw new UserError(`Failed to retrieve databases`);
+    }
+    log.info(JSON.stringify(response, null, 2));
+    return;
+}
+
+export async function getDatabaseConnectionCmd(options: GenezioDatabaseOptions) {
+    if (!options.id) {
+        throw new UserError(`Database ID is required`);
+    }
+    const response = await getConnectionUrl(options.id);
+    if (!response) {
+        throw new UserError(`Failed to retrieve databases`);
+    }
+    log.info(JSON.stringify(response, null, 2));
+    return;
+}
+
+export async function createDatabaseCmd(options: GenezioDatabaseOptions) {
+    if (!options.name) {
+        throw new UserError(`Database name is required`);
+    }
+    const configIOController = new YamlConfigurationIOController(options.config);
+    const config = await configIOController.read();
+
+    const database = config.services?.databases?.find((db) => db.name === options.name);
+    if (!database) {
+        throw new UserError(`Database ${options.name} not found in configuration.`);
+    }
+
+    let createdDatabaseRequest: CreateDatabaseRequest = {
+        name: database.name,
+        region: database.region || config.region,
+        type: database.type,
+    };
+    if (database.type === DatabaseType.mongo) {
+        createdDatabaseRequest = {
+            ...createdDatabaseRequest,
+            clusterType: database.clusterType,
+            clusterName: database.clusterName,
+            clusterTier: database.clusterTier,
+        };
+    }
+
+    const response = await createDatabase(createdDatabaseRequest, undefined, undefined, false);
+    if (!response) {
+        throw new UserError(`Failed to create database ${options.name}`);
+    }
+    log.info(`Request to create database ${response.databaseId} was successfully sent.`);
+
+    return;
+}
diff --git a/src/commands/deploy/utils.ts b/src/commands/deploy/utils.ts
@@ -117,12 +117,22 @@ export async function prepareServicesPreBackendDeployment(
             if (!database.region) {
                 database.region = configuration.region;
             }
+            let createdDatabaseRequest: CreateDatabaseRequest = {
+                name: database.name,
+                region: database.region,
+                type: database.type,
+            };
+            if (database.type === DatabaseType.mongo) {
+                createdDatabaseRequest = {
+                    ...createdDatabaseRequest,
+                    clusterType: database.clusterType,
+                    clusterName: database.clusterName,
+                    clusterTier: database.clusterTier,
+                };
+            }
+
             await getOrCreateDatabase(
-                {
-                    name: database.name,
-                    region: database.region,
-                    type: database.type,
-                },
+                createdDatabaseRequest,
                 environment || "prod",
                 projectDetails.projectId,
                 projectDetails.projectEnvId,
@@ -701,12 +711,23 @@ export async function enableAuthentication(
         if (!configDatabase.region) {
             configDatabase.region = configuration.region;
         }
+
+        let createdDatabaseRequest: CreateDatabaseRequest = {
+            name: configDatabase.name,
+            region: configDatabase.region,
+            type: configDatabase.type,
+        };
+        if (configDatabase.type === DatabaseType.mongo) {
+            createdDatabaseRequest = {
+                ...createdDatabaseRequest,
+                clusterType: configDatabase.clusterType,
+                clusterName: configDatabase.clusterName,
+                clusterTier: configDatabase.clusterTier,
+            };
+        }
+
         const database: GetDatabaseResponse | undefined = await getOrCreateDatabase(
-            {
-                name: configDatabase.name,
-                region: configDatabase.region,
-                type: configDatabase.type,
-            },
+            createdDatabaseRequest,
             stage,
             projectId,
             projectEnvId,
diff --git a/src/commands/local.ts b/src/commands/local.ts
@@ -42,6 +42,7 @@ import { DartBundler } from "../bundlers/dart/localDartBundler.js";
 import axios, { AxiosError, AxiosResponse } from "axios";
 import { findAvailablePort } from "../utils/findAvailablePort.js";
 import {
+    DatabaseType,
     entryFileFunctionMap,
     FunctionType,
     Language,
@@ -103,6 +104,7 @@ import { getFunctionEntryFilename } from "../utils/getFunctionEntryFilename.js";
 import { SSRFrameworkComponent } from "./deploy/command.js";
 import fs from "fs";
 import { detectPythonCommand } from "../utils/detectPythonCommand.js";
+import { CreateDatabaseRequest } from "../models/requests.js";
 
 type UnitProcess = {
     process: ChildProcess;
@@ -168,12 +170,22 @@ export async function prepareLocalBackendEnvironment(
                     if (!database.region) {
                         database.region = region;
                     }
+                    let createdDatabaseRequest: CreateDatabaseRequest = {
+                        name: database.name,
+                        region: database.region,
+                        type: database.type,
+                    };
+                    if (database.type === DatabaseType.mongo) {
+                        createdDatabaseRequest = {
+                            ...createdDatabaseRequest,
+                            clusterType: database.clusterType,
+                            clusterName: database.clusterName,
+                            clusterTier: database.clusterTier,
+                        };
+                    }
+
                     const remoteDatabase = await getOrCreateDatabase(
-                        {
-                            name: database.name,
-                            region: database.region,
-                            type: database.type,
-                        },
+                        createdDatabaseRequest,
                         options.stage || "prod",
                         projectDetails.projectId,
                         projectDetails.projectEnvId,
diff --git a/src/genezio.ts b/src/genezio.ts
@@ -36,6 +36,7 @@ import {
     GenezioBundleFunctionOptions,
     GenezioAnalyzeOptions,
     GenezioEnvOptions,
+    GenezioDatabaseOptions,
 } from "./models/commandOptions.js";
 import currentGenezioVersion, {
     checkNodeMinimumVersion,
@@ -57,6 +58,11 @@ import { CloudProviderIdentifier } from "./models/cloudProviderIdentifier.js";
 import { isCI } from "./utils/process.js";
 import { analyzeCommand, DEFAULT_FORMAT } from "./commands/analyze/command.js";
 import { revealEnvironmentVariables } from "./commands/env.js";
+import {
+    createDatabaseCmd,
+    getDatabaseConnectionCmd,
+    listDatabasesCmd,
+} from "./commands/database.js";
 
 const program = new Command();
 
@@ -110,7 +116,8 @@ program.hook("preAction", async (thisCommand) => {
     if (
         thisCommand.args[0] === "analyze" ||
         thisCommand.args[0] === "getenv" ||
-        thisCommand.args[0] === "list"
+        thisCommand.args[0] === "list" ||
+        thisCommand.args[0] === "database"
     ) {
         return;
     }
@@ -823,4 +830,44 @@ program
         exit(0);
     });
 
+program
+    .command("database")
+    .option(
+        "--action <action>",
+        "The action to perform on the database service - list, create, delete.",
+        "list",
+    )
+    .option("--name <name>", "The name of the database service.")
+    .option("--id <id>", "The name of the database service.")
+    .option("--config <config>", "The project name to pull from.", "./genezio.yaml")
+    .option("--stage <stage>", "The stage of the project to pull from.", "prod")
+    .summary("Manage the database service.")
+    .action(async (options: GenezioDatabaseOptions) => {
+        switch (options.action) {
+            case "list":
+                await listDatabasesCmd(options).catch((error) => {
+                    logError(error);
+                    exit(1);
+                });
+                break;
+
+            case "create":
+                await createDatabaseCmd(options).catch((error) => {
+                    logError(error);
+                    exit(1);
+                });
+                break;
+            case "get-connection":
+                await getDatabaseConnectionCmd(options).catch((error) => {
+                    logError(error);
+                    exit(1);
+                });
+                break;
+            default:
+                log.error(`Unknown action: ${options.action}`);
+                exit(1);
+        }
+        exit(0);
+    });
+
 export default program;
diff --git a/src/models/commandOptions.ts b/src/models/commandOptions.ts
@@ -99,6 +99,13 @@ export interface GenezioEnvOptions extends BaseOptions {
     format?: string;
 }
 
+export interface GenezioDatabaseOptions extends BaseOptions {
+    id?: string;
+    name?: string;
+    config?: string;
+    action?: string;
+}
+
 export interface GenezioCreateInteractiveOptions extends BaseOptions {
     path?: string;
 }
diff --git a/src/models/requests.ts b/src/models/requests.ts
@@ -5,10 +5,26 @@ import {
 } from "../projectConfiguration/yaml/models.js";
 import { ProjectDetailsEnvElement } from "../requests/models.js";
 
+export enum MongoClusterType {
+    SHARED = "sharedCluster",
+    DEDICATED = "dedicatedCluster",
+}
+
+export enum MongoClusterTier {
+    M10 = "M10",
+    M20 = "M20",
+    M30 = "M30",
+    M40 = "M40",
+    M50 = "M50",
+}
+
 export interface CreateDatabaseRequest {
     name: string;
     region: string;
     type: DatabaseType;
+    clusterType?: MongoClusterType;
+    clusterName?: string;
+    clusterTier?: MongoClusterTier;
 }
 
 export interface CreateDatabaseResponse {
@@ -39,6 +55,10 @@ export interface GetDatabasesResponse {
         type: string;
     }[];
 }
+export interface GetConnectionUrlResponse {
+    status: string;
+    connectionUrl: string;
+}
 
 export interface LinkedDatabaseResponse {
     status: string;
diff --git a/src/projectConfiguration/yaml/v2.ts b/src/projectConfiguration/yaml/v2.ts
@@ -25,6 +25,7 @@ import yaml, { YAMLParseError } from "yaml";
 import { DeepRequired } from "../../utils/types.js";
 import { isUnique } from "../../utils/yaml.js";
 import path from "path";
+import { MongoClusterTier, MongoClusterType } from "../../models/requests.js";
 
 export type RawYamlProjectConfiguration = ReturnType<typeof parseGenezioConfig>;
 export type YAMLBackend = NonNullable<YamlProjectConfiguration["backend"]>;
@@ -188,6 +189,9 @@ function parseGenezioConfig(config: unknown) {
                 region: zod
                     .enum(mongoDatabaseRegions.map((r) => r.value) as [string, ...string[]])
                     .optional(),
+                clusterType: zod.nativeEnum(MongoClusterType).optional(),
+                clusterName: zod.string().optional(),
+                clusterTier: zod.nativeEnum(MongoClusterTier).optional(),
             }),
         );
 
diff --git a/src/requests/database.ts b/src/requests/database.ts
@@ -1,6 +1,7 @@
 import {
     CreateDatabaseRequest,
     CreateDatabaseResponse,
+    GetConnectionUrlResponse,
     GetDatabaseConnectionUrl,
     GetDatabaseResponse,
     GetDatabasesResponse,
@@ -25,6 +26,9 @@ export async function createDatabase(
         name: name,
         region: region,
         type: type,
+        clusterType: request.clusterType,
+        clusterName: request.clusterName,
+        clusterTier: request.clusterTier,
     });
 
     const databaseResponse = (await sendRequest(
@@ -88,3 +92,19 @@ export async function findLinkedDatabase(
 
     return response.databases.find((database) => database.name === name);
 }
+
+export async function listDatabases(): Promise<GetDatabaseResponse[] | undefined> {
+    const response = (await sendRequest("GET", `databases`, "")) as GetDatabasesResponse;
+
+    return response.databases;
+}
+
+export async function getConnectionUrl(databaseId: string): Promise<string | undefined> {
+    const response = (await sendRequest(
+        "GET",
+        `databases/${databaseId}`,
+        "",
+    )) as GetConnectionUrlResponse;
+
+    return response.connectionUrl;
+}

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,13 @@ export interface GenezioEnvOptions extends BaseOptions {`
`99`	`99`	`format?: string;`
`100`	`100`	`}`
`101`	`101`
	`102`	`+export interface GenezioDatabaseOptions extends BaseOptions {`
	`103`	`+ id?: string;`
	`104`	`+ name?: string;`
	`105`	`+ config?: string;`
	`106`	`+ action?: string;`
	`107`	`+}`
	`108`	`+`
`102`	`109`	`export interface GenezioCreateInteractiveOptions extends BaseOptions {`
`103`	`110`	`path?: string;`
`104`	`111`	`}`