homelab/operator
1
0
Fork 0
mirror of https://github.com/morten-olsen/homelab-operator.git synced 2026-02-08 01:36:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix pg db

Browse Source
This commit is contained in:
Morten Olsen
2025-08-11 14:35:15 +02:00
parent 47cf43b44e
commit ddb3c79657
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/custom-resouces/postgres-database/portgres-database.schemas.ts
View File

@@ -9,6 +9,7 @@ const postgresDatabaseSecretSchema = z.object({
port: z.string(), port: z.string(),
user: z.string(), user: z.string(),
password: z.string(), password: z.string(),
database: z.string().optional(),
}); });
const postgresDatabaseConnectionSecretSchema = z.object({ const postgresDatabaseConnectionSecretSchema = z.object({

4
src/custom-resouces/postgres-database/postgres-database.resource.ts
View File

@@ -95,6 +95,7 @@ class PostgresDatabaseResource extends CustomResource<typeof postgresDatabaseSpe
port: serverSecretData.data.port, port: serverSecretData.data.port,
user: this.#userName, user: this.#userName,
database: this.#dbName, database: this.#dbName,
...databaseSecretData.data,
}; };
if (!isDeepSubset(databaseSecretData.data, expectedSecret)) { if (!isDeepSubset(databaseSecretData.data, expectedSecret)) {
@@ -132,7 +133,7 @@ class PostgresDatabaseResource extends CustomResource<typeof postgresDatabaseSpe
}; };
} }
const secretData = postgresDatabaseConnectionSecretSchema.safeParse(decodeSecret(this.#serverSecret.current?.data)); const secretData = postgresDatabaseConnectionSecretSchema.safeParse(decodeSecret(this.#databaseSecret.data));
if (!secretData.success || !secretData.data) { if (!secretData.success || !secretData.data) {
return { return {
ready: false, ready: false,
@@ -145,6 +146,7 @@ class PostgresDatabaseResource extends CustomResource<typeof postgresDatabaseSpe
const database = postgresService.get({ const database = postgresService.get({
...connectionSecretData.data, ...connectionSecretData.data,
port: connectionSecretData.data.port ? Number(connectionSecretData.data.port) : 5432, port: connectionSecretData.data.port ? Number(connectionSecretData.data.port) : 5432,
database: connectionSecretData.data.database,
}); });
await database.upsertRole({ await database.upsertRole({
name: secretData.data.user, name: secretData.data.user,

2
src/services/postgres/postgres.instance.ts
View File

@@ -10,6 +10,7 @@ type PostgresInstanceOptions = {
port?: number; port?: number;
user: string; user: string;
password: string; password: string;
database?: string;
}; };
class PostgresInstance { class PostgresInstance {
@@ -23,6 +24,7 @@ class PostgresInstance {
user: process.env.FORCE_PG_USER ?? options.user, user: process.env.FORCE_PG_USER ?? options.user,
password: process.env.FORCE_PG_PASSWORD ?? options.password, password: process.env.FORCE_PG_PASSWORD ?? options.password,
port: process.env.FORCE_PG_PORT ? parseInt(process.env.FORCE_PG_PORT) : options.port, port: process.env.FORCE_PG_PORT ? parseInt(process.env.FORCE_PG_PORT) : options.port,
database: options.database,
}, },
}); });
} }