anbaric-cloud-hosting 1.3.0 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anbaric-cloud-hosting",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "Anbaric Cloud hosting service: Postgres-backed job persistence and queuing exposed over an HTTP API",
   "license": "MIT",
   "author": "chris@anbaric.ai",
@@ -17,15 +17,15 @@
     "@aws-sdk/client-s3": "^3.1110.0",
     "@aws-sdk/client-secrets-manager": "^3.700.0",
     "@aws-sdk/client-servicediscovery": "^3.1110.0",
-    "anbaric-data-store": "^1.3.0",
-    "anbaric-tsapi": "^1.3.0",
+    "anbaric-data-store": "^1.5.0",
+    "anbaric-tsapi": "^1.5.0",
     "pg": "^8.16.0"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",
     "@types/pg": "^8.15.0",
-    "anbaric-cloud": "^1.3.0",
-    "anbaric-state-machine": "^1.3.0",
+    "anbaric-impl-cloud": "^1.5.0",
+    "anbaric-state-machine": "^1.5.0",
     "tsx": "^4.20.0",
     "typescript": "^7.0.2"
   },

package/src/auditing/AuditRecordStore.ts

@@ -1,8 +1,9 @@
-import {AuditRecord} from "anbaric-tsapi";
+import {AuditChange, AuditRecord} from "anbaric-tsapi";
 
 type AuditFilter = {
     jobId? : string,
     actorId? : string,
+    change? : AuditChange,
     search? : string,
     pageSize? : number,
     page? : number,

package/src/auditing/InMemoryAuditRecordStore.ts

@@ -17,6 +17,7 @@ class InMemoryAuditRecordStore implements AuditRecordStore {
         return this.records
             .filter(record => !filter.jobId || record.jobId === filter.jobId)
             .filter(record => !filter.actorId || record.actorId === filter.actorId)
+            .filter(record => !filter.change || record.change === filter.change)
             .filter(record => !filter.search ||
                 record.description.toLowerCase().includes(filter.search.toLowerCase()))
             .reverse()

package/src/data-store/PostgresAuditRecordStore.ts

@@ -8,9 +8,9 @@ class PostgresAuditRecordStore implements AuditRecordStore {
 
     async save(record : AuditRecord) : Promise<void> {
         await this.pool.query(
-            `INSERT INTO anbaric_system.audit_records (job_id, actor_id, actor_type, description, details)
-             VALUES ($1, $2, $3, $4, $5)`,
-            [record.jobId, record.actorId ?? null, record.actorType ?? null,
+            `INSERT INTO anbaric_system.audit_records (job_id, actor_id, actor_type, change, description, details)
+             VALUES ($1, $2, $3, $4, $5, $6)`,
+            [record.jobId, record.actorId, record.actorType, record.change,
                 record.description, JSON.stringify(record.details ?? null)],
         );
     }
@@ -27,6 +27,10 @@ class PostgresAuditRecordStore implements AuditRecordStore {
             parameters.push(filter.actorId);
             conditions.push(`actor_id = $${parameters.length}`);
         }
+        if (filter.change) {
+            parameters.push(filter.change);
+            conditions.push(`change = $${parameters.length}::anbaric_system.audit_change`);
+        }
         if (filter.search) {
             parameters.push(`%${filter.search}%`);
             conditions.push(`description ILIKE $${parameters.length}`);
@@ -39,7 +43,7 @@ class PostgresAuditRecordStore implements AuditRecordStore {
         const offset = `OFFSET $${parameters.length}`;
 
         const result = await this.pool.query(
-            `SELECT id, job_id, actor_id, actor_type, description, details, at
+            `SELECT id, job_id, actor_id, actor_type, change, description, details, at
              FROM anbaric_system.audit_records ${where}
              ORDER BY at DESC, id DESC ${limit} ${offset}`,
             parameters,
@@ -48,8 +52,9 @@ class PostgresAuditRecordStore implements AuditRecordStore {
         return result.rows.map(row => ({
             id: String(row.id),
             jobId: row.job_id,
-            actorId: row.actor_id ?? undefined,
-            actorType: row.actor_type ?? undefined,
+            actorId: row.actor_id,
+            actorType: row.actor_type,
+            change: row.change,
             description: row.description,
             details: row.details,
             at: row.at.toISOString(),

package/src/data-store/Schema.ts

@@ -52,17 +52,31 @@ const ensureSchema = async (pool : Pool) : Promise<void> => {
         )
     `);
     await pool.query("ALTER TABLE anbaric_system.cli_keys ADD COLUMN IF NOT EXISTS tenant TEXT");
+    await pool.query(`
+        DO $$ BEGIN
+            CREATE TYPE anbaric_system.audit_change AS ENUM ('CREATE', 'UPDATE_PROPERTIES', 'CHANGE_STATE', 'DELETE');
+        EXCEPTION WHEN duplicate_object THEN null;
+        END $$
+    `);
     await pool.query(`
         CREATE TABLE IF NOT EXISTS anbaric_system.audit_records (
             id          BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
             job_id      TEXT NOT NULL,
-            actor_id    TEXT,
-            actor_type  TEXT,
+            actor_id    TEXT NOT NULL,
+            actor_type  TEXT NOT NULL,
+            change      anbaric_system.audit_change NOT NULL,
             description TEXT NOT NULL,
             details     JSONB,
             at          TIMESTAMPTZ NOT NULL DEFAULT now()
         )
     `);
+    await pool.query("ALTER TABLE anbaric_system.audit_records ADD COLUMN IF NOT EXISTS change anbaric_system.audit_change");
+    await pool.query("UPDATE anbaric_system.audit_records SET change = 'UPDATE_PROPERTIES' WHERE change IS NULL");
+    await pool.query("UPDATE anbaric_system.audit_records SET actor_id = 'system' WHERE actor_id IS NULL");
+    await pool.query("UPDATE anbaric_system.audit_records SET actor_type = 'CODE' WHERE actor_type IS NULL");
+    await pool.query("ALTER TABLE anbaric_system.audit_records ALTER COLUMN change SET NOT NULL");
+    await pool.query("ALTER TABLE anbaric_system.audit_records ALTER COLUMN actor_id SET NOT NULL");
+    await pool.query("ALTER TABLE anbaric_system.audit_records ALTER COLUMN actor_type SET NOT NULL");
     await pool.query("CREATE INDEX IF NOT EXISTS audit_records_job_id ON anbaric_system.audit_records (job_id)");
 };
 

package/src/hosting/HostingServer.ts

@@ -30,6 +30,7 @@ class HostingServer {
                 private tokenAuthenticator? : TokenAuthenticator,
                 private tenant? : string,
                 auditRecords? : AuditRecordStore) {
+
         this.router = new Router(persistence, queue, registry, buildLayer, documentStoreFor, secretStore, cliAuthorizer, tenant, auditRecords);
         this.server = this.serverFor((request, response) => this.handle(request, response));
         this.internalServer = this.serverFor((request, response) => this.handleInternal(request, response));