@serve.zone/gitops 32.1.0 → 32.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +18 -0
- package/deno.json +1 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes/actionlog.d.ts +1 -1
- package/dist_ts/classes/actionlog.js +1 -1
- package/dist_ts/classes/connectionmanager.d.ts +1 -5
- package/dist_ts/classes/connectionmanager.js +5 -28
- package/dist_ts/classes/gitopsapp.d.ts +8 -3
- package/dist_ts/classes/gitopsapp.js +29 -18
- package/dist_ts/{cache/classes.secrets.scan.service.d.ts → classes/secrets.scan.service.d.ts} +1 -1
- package/dist_ts/{cache/classes.secrets.scan.service.js → classes/secrets.scan.service.js} +3 -3
- package/dist_ts/{cache → db}/classes.cache.cleaner.d.ts +1 -3
- package/dist_ts/db/classes.cache.cleaner.js +59 -0
- package/dist_ts/{cache → db}/classes.cached.document.d.ts +1 -1
- package/dist_ts/{cache → db}/classes.cached.document.js +2 -2
- package/dist_ts/db/classes.gitops-db.d.ts +34 -0
- package/dist_ts/db/classes.gitops-db.js +77 -0
- package/dist_ts/{cache → db}/documents/classes.cached.project.js +3 -3
- package/dist_ts/{cache → db}/documents/classes.cached.secret.js +3 -3
- package/dist_ts/db/documents/classes.storage.record.d.ts +14 -0
- package/dist_ts/db/documents/classes.storage.record.js +82 -0
- package/dist_ts/{cache → db}/documents/index.d.ts +1 -0
- package/dist_ts/db/documents/index.js +4 -0
- package/dist_ts/db/index.d.ts +5 -0
- package/dist_ts/db/index.js +5 -0
- package/dist_ts/paths.d.ts +2 -2
- package/dist_ts/paths.js +2 -3
- package/dist_ts/plugins.d.ts +2 -3
- package/dist_ts/plugins.js +6 -4
- package/dist_ts/storage/classes.storagemanager.d.ts +7 -16
- package/dist_ts/storage/classes.storagemanager.js +54 -94
- package/dist_ts/storage/index.d.ts +0 -1
- package/dist_ts_migrations/classes.migration-record.d.ts +11 -0
- package/dist_ts_migrations/classes.migration-record.js +80 -0
- package/dist_ts_migrations/import-filesystem-records.d.ts +9 -0
- package/dist_ts_migrations/import-filesystem-records.js +74 -0
- package/dist_ts_migrations/index.d.ts +12 -0
- package/dist_ts_migrations/index.js +24 -0
- package/dist_ts_migrations/interfaces.d.ts +16 -0
- package/dist_ts_migrations/interfaces.js +2 -0
- package/package.json +6 -4
- package/readme.md +21 -14
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes/actionlog.ts +1 -1
- package/ts/classes/connectionmanager.ts +4 -27
- package/ts/classes/gitopsapp.ts +36 -17
- package/ts/{cache/classes.secrets.scan.service.ts → classes/secrets.scan.service.ts} +3 -3
- package/ts/{cache → db}/classes.cache.cleaner.ts +1 -4
- package/ts/{cache → db}/classes.cached.document.ts +1 -1
- package/ts/db/classes.gitops-db.ts +92 -0
- package/ts/{cache → db}/documents/classes.cached.project.ts +2 -2
- package/ts/{cache → db}/documents/classes.cached.secret.ts +2 -2
- package/ts/db/documents/classes.storage.record.ts +26 -0
- package/ts/{cache → db}/documents/index.ts +1 -0
- package/ts/db/index.ts +5 -0
- package/ts/paths.ts +3 -4
- package/ts/plugins.ts +5 -3
- package/ts/storage/classes.storagemanager.ts +59 -95
- package/ts/storage/index.ts +0 -1
- package/ts_migrations/classes.migration-record.ts +23 -0
- package/ts_migrations/import-filesystem-records.ts +79 -0
- package/ts_migrations/index.ts +31 -0
- package/ts_migrations/interfaces.ts +18 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/dist_ts/cache/classes.cache.cleaner.js +0 -61
- package/dist_ts/cache/classes.cachedb.d.ts +0 -22
- package/dist_ts/cache/classes.cachedb.js +0 -58
- package/dist_ts/cache/documents/index.js +0 -3
- package/dist_ts/cache/index.d.ts +0 -7
- package/dist_ts/cache/index.js +0 -6
- package/ts/cache/classes.cachedb.ts +0 -72
- package/ts/cache/index.ts +0 -7
- /package/dist_ts/{cache → db}/documents/classes.cached.project.d.ts +0 -0
- /package/dist_ts/{cache → db}/documents/classes.cached.secret.d.ts +0 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-19 - 32.2.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Keep every record in one document database (db)
|
|
8
|
+
- gitops now requires `GITOPS_MONGODB_URL` and reads `GITOPS_MONGODB_NAME` (default `gitops`). Startup refuses by name and exits when the URL is absent; there is no embedded engine and no filesystem fallback, so an instance can never silently come up having forgotten everything it was told.
|
|
9
|
+
- Provider connections, sync configurations and their per-repo status and mappings, jobs, managed secrets, the action log and the BookStack content hashes moved out of `~/.serve.zone/gitops/storage/**.json` into `StorageRecord` documents. The key is unchanged — the former file path, for example `/connections/<id>.json` — and the value is the same text the file held, byte for byte, including its indentation. `StorageRecord` stores the key as the document `_id`, so the primary key is the only uniqueness authority and a prefix listing is answered by the `_id` index.
|
|
10
|
+
- On the first start against the database, records found below `~/.serve.zone/gitops/storage/` and in a development checkout's `./.nogit/connections.json` are imported once by the `import-filesystem-records` migration in `ts_migrations/`. Both sources are read, never written; the completion is recorded in the `MigrationRecord` ledger, so a later start skips the import and never overwrites an edited record. Keep the old directory mounted for that first start, then archive it.
|
|
11
|
+
- Cached projects and secrets no longer live in a disposable in-memory server that was discarded on every restart; they are documents in the same database, still bounded by their TTL and still swept hourly by the cache cleaner. Nothing durable moves with them, because nothing durable existed: `CachedProject` keeps the exact member set and indexes 32.1.0 wrote, while `CachedSecret` no longer carries `defaultBranch`, `description`, `projectName` and `projectUrl` as nulls — smartdata 7.1.7 collected the shared base class's saveable properties across both subclasses and leaked its sibling's fields into every secret.
|
|
12
|
+
- `~/.serve.zone/gitops/tsmdb/` is gone. The `storagePath` option the cache database accepted was never passed to the engine, so the directory was never written; it is removed rather than wired up.
|
|
13
|
+
|
|
14
|
+
### Changes
|
|
15
|
+
|
|
16
|
+
- Replace `@push.rocks/smartdata` 7.1.7 with `@lossless.org/client` 1.1.0 (deps)
|
|
17
|
+
- The document ORM is `@lossless.org/client/nosqldb`, a fork of smartdata 11.14.2 with an identical API surface, imported in `ts/plugins.ts` under the name every call site already used. `@push.rocks/smartmongo` stays only as a dev dependency, where it provides the disposable server the suite runs against.
|
|
18
|
+
- `ts/cache/` became `ts/db/`, `CacheDb` became `GitopsDb`, and the secrets scan service moved to `ts/classes/`, so the database module holds the database and the services that talk to providers sit with the other services.
|
|
19
|
+
- `test/test.persisted-bytes.node.ts` states the stored member sets, `_id` types and index names of all four collections, read through the models' own inspection API. The image qualification proves the entrypoint refuses a missing database binding by name and that the ops server port is never opened when the database is unreachable.
|
|
20
|
+
|
|
3
21
|
## 2026-09-19 - 32.1.0
|
|
4
22
|
|
|
5
23
|
### Features
|
package/deno.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/gitops',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.2.0',
|
|
7
7
|
description: 'GitOps management app for Gitea and GitLab - manage secrets, browse projects, view CI pipelines, and stream build logs'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxvQkFBb0I7SUFDMUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHdIQUF3SDtDQUN0SSxDQUFBIn0=
|
|
@@ -2,7 +2,7 @@ import type * as interfaces from '../../dist_ts_interfaces/index.js';
|
|
|
2
2
|
import type { StorageManager } from '../storage/index.js';
|
|
3
3
|
/**
|
|
4
4
|
* Persists and queries action log entries via StorageManager.
|
|
5
|
-
* Entries are stored as individual
|
|
5
|
+
* Entries are stored as individual records keyed by timestamp-id.
|
|
6
6
|
*/
|
|
7
7
|
export declare class ActionLog {
|
|
8
8
|
private storageManager;
|
|
@@ -2,7 +2,7 @@ import { logger } from '../logging.js';
|
|
|
2
2
|
const ACTIONLOG_PREFIX = '/actionlog/';
|
|
3
3
|
/**
|
|
4
4
|
* Persists and queries action log entries via StorageManager.
|
|
5
|
-
* Entries are stored as individual
|
|
5
|
+
* Entries are stored as individual records keyed by timestamp-id.
|
|
6
6
|
*/
|
|
7
7
|
export class ActionLog {
|
|
8
8
|
storageManager;
|
|
@@ -4,7 +4,7 @@ import { BaseProvider } from '../providers/index.js';
|
|
|
4
4
|
import type { StorageManager } from '../storage/index.js';
|
|
5
5
|
/**
|
|
6
6
|
* Manages provider connections — persists each connection as an
|
|
7
|
-
* individual
|
|
7
|
+
* individual record via StorageManager. Tokens are stored in
|
|
8
8
|
* the OS keychain (or encrypted file fallback) via SmartSecret.
|
|
9
9
|
*/
|
|
10
10
|
export declare class ConnectionManager {
|
|
@@ -20,10 +20,6 @@ export declare class ConnectionManager {
|
|
|
20
20
|
* Fire-and-forget — does not block startup.
|
|
21
21
|
*/
|
|
22
22
|
private testAllConnections;
|
|
23
|
-
/**
|
|
24
|
-
* One-time migration from the legacy .nogit/connections.json file.
|
|
25
|
-
*/
|
|
26
|
-
private migrateLegacyFile;
|
|
27
23
|
private loadConnections;
|
|
28
24
|
/**
|
|
29
25
|
* Migrates a plaintext token to keychain storage.
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import { logger } from '../logging.js';
|
|
3
3
|
import { BaseProvider, GiteaProvider, GitLabProvider } from '../providers/index.js';
|
|
4
|
-
const LEGACY_CONNECTIONS_FILE = './.nogit/connections.json';
|
|
5
4
|
const CONNECTIONS_PREFIX = '/connections/';
|
|
6
5
|
const KEYCHAIN_PREFIX = 'keychain:';
|
|
7
6
|
const getRegistryTokenSecretId = (connectionId) => `${connectionId}:registry`;
|
|
@@ -13,7 +12,7 @@ const getWebhookSecretId = (connectionId) => `${connectionId}:webhook`;
|
|
|
13
12
|
const mintWebhookSecret = () => plugins.crypto.randomBytes(32).toString('hex');
|
|
14
13
|
/**
|
|
15
14
|
* Manages provider connections — persists each connection as an
|
|
16
|
-
* individual
|
|
15
|
+
* individual record via StorageManager. Tokens are stored in
|
|
17
16
|
* the OS keychain (or encrypted file fallback) via SmartSecret.
|
|
18
17
|
*/
|
|
19
18
|
export class ConnectionManager {
|
|
@@ -27,7 +26,6 @@ export class ConnectionManager {
|
|
|
27
26
|
this.smartSecret = smartSecret;
|
|
28
27
|
}
|
|
29
28
|
async init() {
|
|
30
|
-
await this.migrateLegacyFile();
|
|
31
29
|
await this.loadConnections();
|
|
32
30
|
// Auto-test all connections in the background
|
|
33
31
|
this.healthCheckDone = this.testAllConnections();
|
|
@@ -51,27 +49,6 @@ export class ConnectionManager {
|
|
|
51
49
|
}
|
|
52
50
|
}
|
|
53
51
|
}
|
|
54
|
-
/**
|
|
55
|
-
* One-time migration from the legacy .nogit/connections.json file.
|
|
56
|
-
*/
|
|
57
|
-
async migrateLegacyFile() {
|
|
58
|
-
try {
|
|
59
|
-
const text = await plugins.fs.readFile(LEGACY_CONNECTIONS_FILE, 'utf8');
|
|
60
|
-
const legacy = JSON.parse(text);
|
|
61
|
-
if (legacy.length > 0) {
|
|
62
|
-
logger.info(`Migrating ${legacy.length} connection(s) from legacy file...`);
|
|
63
|
-
for (const conn of legacy) {
|
|
64
|
-
await this.storageManager.setJSON(`${CONNECTIONS_PREFIX}${conn.id}.json`, conn);
|
|
65
|
-
}
|
|
66
|
-
// Rename legacy file so migration doesn't repeat
|
|
67
|
-
await plugins.fs.rename(LEGACY_CONNECTIONS_FILE, LEGACY_CONNECTIONS_FILE + '.migrated');
|
|
68
|
-
logger.success('Legacy connections migrated successfully');
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
catch {
|
|
72
|
-
// No legacy file or already migrated — nothing to do
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
52
|
async loadConnections() {
|
|
76
53
|
const keys = await this.storageManager.list(CONNECTIONS_PREFIX);
|
|
77
54
|
this.connections = [];
|
|
@@ -149,7 +126,7 @@ export class ConnectionManager {
|
|
|
149
126
|
async migrateTokenToKeychain(conn) {
|
|
150
127
|
try {
|
|
151
128
|
await this.smartSecret.setSecret(conn.id, conn.token);
|
|
152
|
-
// Save sentinel to
|
|
129
|
+
// Save sentinel to the stored record
|
|
153
130
|
const jsonConn = { ...conn, token: `${KEYCHAIN_PREFIX}${conn.id}` };
|
|
154
131
|
await this.storageManager.setJSON(`${CONNECTIONS_PREFIX}${conn.id}.json`, jsonConn);
|
|
155
132
|
logger.info(`Migrated token for connection "${conn.name}" to keychain`);
|
|
@@ -184,7 +161,7 @@ export class ConnectionManager {
|
|
|
184
161
|
async backfillWebhookSecret(conn) {
|
|
185
162
|
// A stored-but-unreadable secret is not a missing one. Minting here would write a new
|
|
186
163
|
// secret over the same keychain id and destroy confirmed operator material because of
|
|
187
|
-
// a transient read failure, so this connection is left exactly as it is
|
|
164
|
+
// a transient read failure, so this connection is left exactly as it is stored.
|
|
188
165
|
if (conn.webhookSecretUnreadable)
|
|
189
166
|
return;
|
|
190
167
|
if (conn.webhookSecret && conn.webhookStatus)
|
|
@@ -219,7 +196,7 @@ export class ConnectionManager {
|
|
|
219
196
|
else {
|
|
220
197
|
await this.smartSecret.deleteSecret(getWebhookSecretId(conn.id));
|
|
221
198
|
}
|
|
222
|
-
// Save
|
|
199
|
+
// Save the record with sentinel values
|
|
223
200
|
const jsonConn = {
|
|
224
201
|
...conn,
|
|
225
202
|
token: `${KEYCHAIN_PREFIX}${conn.id}`,
|
|
@@ -433,4 +410,4 @@ export class ConnectionManager {
|
|
|
433
410
|
}
|
|
434
411
|
}
|
|
435
412
|
}
|
|
436
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connectionmanager.js","sourceRoot":"","sources":["../../../ts/classes/connectionmanager.ts"],"names":[],"mappings":"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"}
|
|
413
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connectionmanager.js","sourceRoot":"","sources":["../../../ts/classes/connectionmanager.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,8 @@ import { ManagedSecretsManager } from './managedsecrets.manager.js';
|
|
|
6
6
|
import { JobManager } from './jobmanager.js';
|
|
7
7
|
import { OpsServer } from '../opsserver/index.js';
|
|
8
8
|
import { StorageManager } from '../storage/index.js';
|
|
9
|
-
import {
|
|
9
|
+
import { SecretsScanService } from './secrets.scan.service.js';
|
|
10
|
+
import { CacheCleaner, GitopsDb, type IGitopsDbOptions } from '../db/index.js';
|
|
10
11
|
/**
|
|
11
12
|
* Main GitOps application orchestrator
|
|
12
13
|
*/
|
|
@@ -16,7 +17,7 @@ export declare class GitopsApp {
|
|
|
16
17
|
connectionManager: ConnectionManager;
|
|
17
18
|
actionLog: ActionLog;
|
|
18
19
|
opsServer: OpsServer;
|
|
19
|
-
|
|
20
|
+
db: GitopsDb;
|
|
20
21
|
cacheCleaner: CacheCleaner;
|
|
21
22
|
syncManager: SyncManager;
|
|
22
23
|
managedSecretsManager: ManagedSecretsManager;
|
|
@@ -24,7 +25,11 @@ export declare class GitopsApp {
|
|
|
24
25
|
secretsScanService: SecretsScanService;
|
|
25
26
|
private scanIntervalId;
|
|
26
27
|
private paths;
|
|
27
|
-
|
|
28
|
+
/**
|
|
29
|
+
* @param dbOptions binding of the document database; read from the environment unless a
|
|
30
|
+
* caller supplies one, which is how tests bind an isolated server.
|
|
31
|
+
*/
|
|
32
|
+
constructor(dbOptions?: IGitopsDbOptions);
|
|
28
33
|
start(port?: number): Promise<void>;
|
|
29
34
|
stop(): Promise<void>;
|
|
30
35
|
}
|
|
@@ -7,9 +7,16 @@ import { ManagedSecretsManager } from './managedsecrets.manager.js';
|
|
|
7
7
|
import { JobManager } from './jobmanager.js';
|
|
8
8
|
import { OpsServer } from '../opsserver/index.js';
|
|
9
9
|
import { StorageManager } from '../storage/index.js';
|
|
10
|
-
import {
|
|
10
|
+
import { SecretsScanService } from './secrets.scan.service.js';
|
|
11
|
+
import { CacheCleaner, CachedProject, CachedSecret, GitopsDb, readGitopsDbOptionsFromEnvironment, } from '../db/index.js';
|
|
11
12
|
import { resolvePaths } from '../paths.js';
|
|
13
|
+
import { runStartupMigrations } from '../../dist_ts_migrations/index.js';
|
|
12
14
|
import { unrefTimer } from '../timers.js';
|
|
15
|
+
/**
|
|
16
|
+
* The connection list a development checkout kept next to itself before gitops had a
|
|
17
|
+
* database. Resolved against the working directory, exactly as the release that wrote it did.
|
|
18
|
+
*/
|
|
19
|
+
const legacyConnectionsFile = './.nogit/connections.json';
|
|
13
20
|
/**
|
|
14
21
|
* Main GitOps application orchestrator
|
|
15
22
|
*/
|
|
@@ -19,7 +26,7 @@ export class GitopsApp {
|
|
|
19
26
|
connectionManager;
|
|
20
27
|
actionLog;
|
|
21
28
|
opsServer;
|
|
22
|
-
|
|
29
|
+
db;
|
|
23
30
|
cacheCleaner;
|
|
24
31
|
syncManager;
|
|
25
32
|
managedSecretsManager;
|
|
@@ -27,29 +34,33 @@ export class GitopsApp {
|
|
|
27
34
|
secretsScanService;
|
|
28
35
|
scanIntervalId = null;
|
|
29
36
|
paths;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
+
/**
|
|
38
|
+
* @param dbOptions binding of the document database; read from the environment unless a
|
|
39
|
+
* caller supplies one, which is how tests bind an isolated server.
|
|
40
|
+
*/
|
|
41
|
+
constructor(dbOptions = readGitopsDbOptionsFromEnvironment()) {
|
|
42
|
+
this.paths = resolvePaths();
|
|
43
|
+
this.storageManager = new StorageManager();
|
|
37
44
|
this.smartSecret = new plugins.smartsecret.SmartSecret({ service: 'gitops' });
|
|
38
45
|
this.connectionManager = new ConnectionManager(this.storageManager, this.smartSecret);
|
|
39
46
|
this.actionLog = new ActionLog(this.storageManager);
|
|
40
|
-
this.
|
|
41
|
-
|
|
42
|
-
dbName: 'gitops_cache',
|
|
43
|
-
});
|
|
44
|
-
this.cacheCleaner = new CacheCleaner(this.cacheDb);
|
|
47
|
+
this.db = GitopsDb.getInstance(dbOptions);
|
|
48
|
+
this.cacheCleaner = new CacheCleaner();
|
|
45
49
|
this.cacheCleaner.registerClass(CachedProject);
|
|
46
50
|
this.cacheCleaner.registerClass(CachedSecret);
|
|
47
51
|
this.opsServer = new OpsServer(this);
|
|
48
52
|
}
|
|
49
53
|
async start(port = 3000) {
|
|
50
54
|
logger.info('Initializing GitOps...');
|
|
51
|
-
//
|
|
52
|
-
|
|
55
|
+
// Every record below is read through the database, so it comes up first and the
|
|
56
|
+
// pending migrations run before any manager looks at a key.
|
|
57
|
+
await this.db.start();
|
|
58
|
+
await runStartupMigrations({
|
|
59
|
+
storage: this.storageManager,
|
|
60
|
+
legacyStoragePath: this.paths.legacyStoragePath,
|
|
61
|
+
legacyConnectionsFile: legacyConnectionsFile,
|
|
62
|
+
log: (messageArg) => logger.info(messageArg),
|
|
63
|
+
});
|
|
53
64
|
// Initialize connection manager (loads saved connections)
|
|
54
65
|
await this.connectionManager.init();
|
|
55
66
|
// Initialize managed secrets manager
|
|
@@ -94,8 +105,8 @@ export class GitopsApp {
|
|
|
94
105
|
await this.syncManager.stop();
|
|
95
106
|
}
|
|
96
107
|
this.cacheCleaner.stop();
|
|
97
|
-
await this.
|
|
108
|
+
await this.db.stop();
|
|
98
109
|
logger.success('GitOps shutdown complete');
|
|
99
110
|
}
|
|
100
111
|
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0b3BzYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvY2xhc3Nlcy9naXRvcHNhcHAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN2QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDM0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3BFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM3QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQy9ELE9BQU8sRUFDTCxZQUFZLEVBQ1osYUFBYSxFQUNiLFlBQVksRUFDWixRQUFRLEVBQ1Isa0NBQWtDLEdBRW5DLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUMzQyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRTFDOzs7R0FHRztBQUNILE1BQU0scUJBQXFCLEdBQUcsMkJBQTJCLENBQUM7QUFFMUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sU0FBUztJQUNiLGNBQWMsQ0FBaUI7SUFDL0IsV0FBVyxDQUFrQztJQUM3QyxpQkFBaUIsQ0FBb0I7SUFDckMsU0FB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
|
package/dist_ts/{cache/classes.secrets.scan.service.d.ts → classes/secrets.scan.service.d.ts}
RENAMED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ConnectionManager } from '
|
|
1
|
+
import type { ConnectionManager } from './connectionmanager.js';
|
|
2
2
|
import type { ISecret } from '../../dist_ts_interfaces/data/secret.js';
|
|
3
3
|
export interface IScanResult {
|
|
4
4
|
connectionsScanned: number;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { logger } from '../logging.js';
|
|
2
|
-
import { CachedSecret } from '
|
|
3
|
-
import { TTL } from '
|
|
2
|
+
import { CachedSecret } from '../db/documents/classes.cached.secret.js';
|
|
3
|
+
import { TTL } from '../db/classes.cached.document.js';
|
|
4
4
|
/**
|
|
5
5
|
* Centralized secrets scanning service. Fetches all secrets from all
|
|
6
6
|
* connections and upserts them into the CachedSecret collection.
|
|
@@ -234,4 +234,4 @@ export class SecretsScanService {
|
|
|
234
234
|
return docs.length > 0;
|
|
235
235
|
}
|
|
236
236
|
}
|
|
237
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
237
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"secrets.scan.service.js","sourceRoot":"","sources":["../../../ts/classes/secrets.scan.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { CacheDb } from './classes.cachedb.js';
|
|
2
1
|
type DocumentClass = {
|
|
3
2
|
getInstances: (filter: any) => Promise<{
|
|
4
3
|
delete: () => Promise<void>;
|
|
@@ -11,8 +10,7 @@ export declare class CacheCleaner {
|
|
|
11
10
|
private intervalId;
|
|
12
11
|
private intervalMs;
|
|
13
12
|
private documentClasses;
|
|
14
|
-
|
|
15
|
-
constructor(cacheDb: CacheDb, intervalMs?: number);
|
|
13
|
+
constructor(intervalMs?: number);
|
|
16
14
|
/** Register a document class for cleanup */
|
|
17
15
|
registerClass(cls: DocumentClass): void;
|
|
18
16
|
start(): void;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { logger } from '../logging.js';
|
|
2
|
+
import { unrefTimer } from '../timers.js';
|
|
3
|
+
const DEFAULT_INTERVAL_MS = 60 * 60 * 1000; // 1 hour
|
|
4
|
+
/**
|
|
5
|
+
* Periodically cleans up expired cached documents.
|
|
6
|
+
*/
|
|
7
|
+
export class CacheCleaner {
|
|
8
|
+
intervalId = null;
|
|
9
|
+
intervalMs;
|
|
10
|
+
documentClasses = [];
|
|
11
|
+
constructor(intervalMs = DEFAULT_INTERVAL_MS) {
|
|
12
|
+
this.intervalMs = intervalMs;
|
|
13
|
+
}
|
|
14
|
+
/** Register a document class for cleanup */
|
|
15
|
+
registerClass(cls) {
|
|
16
|
+
this.documentClasses.push(cls);
|
|
17
|
+
}
|
|
18
|
+
start() {
|
|
19
|
+
if (this.intervalId !== null)
|
|
20
|
+
return;
|
|
21
|
+
this.intervalId = setInterval(() => {
|
|
22
|
+
this.clean().catch((err) => {
|
|
23
|
+
logger.error(`CacheCleaner error: ${err}`);
|
|
24
|
+
});
|
|
25
|
+
}, this.intervalMs);
|
|
26
|
+
// Unref so the interval doesn't prevent process exit
|
|
27
|
+
unrefTimer(this.intervalId);
|
|
28
|
+
logger.debug(`CacheCleaner started (interval: ${this.intervalMs}ms)`);
|
|
29
|
+
}
|
|
30
|
+
stop() {
|
|
31
|
+
if (this.intervalId !== null) {
|
|
32
|
+
clearInterval(this.intervalId);
|
|
33
|
+
this.intervalId = null;
|
|
34
|
+
logger.debug('CacheCleaner stopped');
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
/** Run a single cleanup pass */
|
|
38
|
+
async clean() {
|
|
39
|
+
const now = Date.now();
|
|
40
|
+
let totalDeleted = 0;
|
|
41
|
+
for (const cls of this.documentClasses) {
|
|
42
|
+
try {
|
|
43
|
+
const expired = await cls.getInstances({ expiresAt: { $lt: now } });
|
|
44
|
+
for (const doc of expired) {
|
|
45
|
+
await doc.delete();
|
|
46
|
+
totalDeleted++;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
catch (err) {
|
|
50
|
+
logger.error(`CacheCleaner: failed to clean class: ${err}`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
if (totalDeleted > 0) {
|
|
54
|
+
logger.debug(`CacheCleaner: deleted ${totalDeleted} expired document(s)`);
|
|
55
|
+
}
|
|
56
|
+
return totalDeleted;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5jYWNoZS5jbGVhbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvZGIvY2xhc3Nlcy5jYWNoZS5jbGVhbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDdkMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUsxQyxNQUFNLG1CQUFtQixHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUMsU0FBUztBQUVyRDs7R0FFRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBQ2YsVUFBVSxHQUEwQyxJQUFJLENBQUM7SUFDekQsVUFBVSxDQUFTO0lBQ25CLGVBQWUsR0FBb0IsRUFBRSxDQUFDO0lBRTlDLFlBQVksVUFBVSxHQUFHLG1CQUFtQjtRQUMxQyxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztJQUMvQixDQUFDO0lBRUQsNENBQTRDO0lBQzVDLGFBQWEsQ0FBQyxHQUFrQjtRQUM5QixJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQsS0FBSztRQUNILElBQUksSUFBSSxDQUFDLFVBQVUsS0FBSyxJQUFJO1lBQUUsT0FBTztRQUNyQyxJQUFJLENBQUMsVUFBVSxHQUFHLFdBQVcsQ0FBQyxHQUFHLEVBQUU7WUFDakMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO2dCQUN6QixNQUFNLENBQUMsS0FBSyxDQUFDLHVCQUF1QixHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQzdDLENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNwQixxREFBcUQ7UUFDckQsVUFBVSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM1QixNQUFNLENBQUMsS0FBSyxDQUFDLG1DQUFtQyxJQUFJLENBQUMsVUFBVSxLQUFLLENBQUMsQ0FBQztJQUN4RSxDQUFDO0lBRUQsSUFBSTtRQUNGLElBQUksSUFBSSxDQUFDLFVBQVUsS0FBSyxJQUFJLEVBQUUsQ0FBQztZQUM3QixhQUFhLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQy9CLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDO1lBQ3ZCLE1BQU0sQ0FBQyxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztRQUN2QyxDQUFDO0lBQ0gsQ0FBQztJQUVELGdDQUFnQztJQUNoQyxLQUFLLENBQUMsS0FBSztRQUNULE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUN2QixJQUFJLFlBQVksR0FBRyxDQUFDLENBQUM7UUFDckIsS0FBSyxNQUFNLEdBQUcsSUFBSSxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDdkMsSUFBSSxDQUFDO2dCQUNILE1BQU0sT0FBTyxHQUFHLE1BQU0sR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFLFNBQVMsRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQ3BFLEtBQUssTUFBTSxHQUFHLElBQUksT0FBTyxFQUFFLENBQUM7b0JBQzFCLE1BQU0sR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDO29CQUNuQixZQUFZLEVBQUUsQ0FBQztnQkFDakIsQ0FBQztZQUNILENBQUM7WUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO2dCQUNiLE1BQU0sQ0FBQyxLQUFLLENBQUMsd0NBQXdDLEdBQUcsRUFBRSxDQUFDLENBQUM7WUFDOUQsQ0FBQztRQUNILENBQUM7UUFDRCxJQUFJLFlBQVksR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNyQixNQUFNLENBQUMsS0FBSyxDQUFDLHlCQUF5QixZQUFZLHNCQUFzQixDQUFDLENBQUM7UUFDNUUsQ0FBQztRQUNELE9BQU8sWUFBWSxDQUFDO0lBQ3RCLENBQUM7Q0FDRiJ9
|
|
@@ -10,7 +10,7 @@ export declare const TTL: {
|
|
|
10
10
|
};
|
|
11
11
|
/**
|
|
12
12
|
* Abstract base class for cached documents with TTL support.
|
|
13
|
-
* Extend this class and add @Collection decorator
|
|
13
|
+
* Extend this class and add a @Collection decorator bound to GitopsDb.
|
|
14
14
|
*/
|
|
15
15
|
export declare abstract class CachedDocument<T extends CachedDocument<T>> extends plugins.smartdata.SmartDataDbDoc<T, T> {
|
|
16
16
|
createdAt: number;
|
|
@@ -44,7 +44,7 @@ export const TTL = {
|
|
|
44
44
|
};
|
|
45
45
|
/**
|
|
46
46
|
* Abstract base class for cached documents with TTL support.
|
|
47
|
-
* Extend this class and add @Collection decorator
|
|
47
|
+
* Extend this class and add a @Collection decorator bound to GitopsDb.
|
|
48
48
|
*/
|
|
49
49
|
let CachedDocument = (() => {
|
|
50
50
|
let _classSuper = plugins.smartdata.SmartDataDbDoc;
|
|
@@ -98,4 +98,4 @@ let CachedDocument = (() => {
|
|
|
98
98
|
};
|
|
99
99
|
})();
|
|
100
100
|
export { CachedDocument };
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5jYWNoZWQuZG9jdW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9kYi9jbGFzc2VzLmNhY2hlZC5kb2N1bWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUM7QUFFekMsNkNBQTZDO0FBQzdDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsR0FBRztJQUNqQixTQUFTLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJO0lBQ3hCLE9BQU8sRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUk7SUFDdkIsUUFBUSxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUk7SUFDN0IsTUFBTSxFQUFFLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxJQUFJO0lBQy9CLE9BQU8sRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBSTtJQUNqQyxPQUFPLEVBQUUsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUk7Q0FDekIsQ0FBQztBQUVYOzs7R0FHRztJQUNtQixjQUFjO3NCQUUxQixPQUFPLENBQUMsU0FBUyxDQUFDLGNBQWM7Ozs7Ozs7Ozs7aUJBRnBCLGNBRXBCLFNBQVEsV0FBc0M7OztxQ0FDN0MsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7cUNBR3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFOzBDQUd4QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtZQUx6Qiw2S0FBTyxTQUFTLDZCQUFULFNBQVMsNkZBQXNCO1lBR3RDLDZLQUFPLFNBQVMsNkJBQVQsU0FBUyw2RkFBb0M7WUFHcEQsNExBQU8sY0FBYyw2QkFBZCxjQUFjLHVHQUFzQjs7O1FBTnBDLFNBQVMsb0RBQVcsSUFBSSxDQUFDLEdBQUcsRUFBRSxFQUFDO1FBRy9CLFNBQVMsNEdBQVcsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsQ0FBQyxPQUFPLEdBQUM7UUFHN0MsY0FBYyxpSEFBVyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUM7UUFFM0M7WUFDRSxLQUFLLEVBQUUsQ0FBQzs7U0FDVDtRQUVELHVDQUF1QztRQUN2QyxNQUFNLENBQUMsRUFBVTtZQUNmLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUNuQyxDQUFDO1FBRUQsK0JBQStCO1FBQy9CLFVBQVUsQ0FBQyxJQUFZO1lBQ3JCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO1FBQzFDLENBQUM7UUFFRCxnQ0FBZ0M7UUFDaEMsV0FBVyxDQUFDLEtBQWE7WUFDdkIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUN0QyxDQUFDO1FBRUQseUNBQXlDO1FBQ3pDLFNBQVM7WUFDUCxPQUFPLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQ3JDLENBQUM7UUFFRCxxQ0FBcUM7UUFDckMsS0FBSztZQUNILElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ25DLENBQUM7OztTQXZDbUIsY0FBYyJ9
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
export interface IGitopsDbOptions {
|
|
3
|
+
/** Connection URL of the document database gitops persists into. */
|
|
4
|
+
mongoDbUrl: string;
|
|
5
|
+
/** Database name inside that server. */
|
|
6
|
+
mongoDbName: string;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Reads the database binding from the process environment. There is no default and no
|
|
10
|
+
* embedded fallback: gitops keeps every durable record — connections, jobs, sync
|
|
11
|
+
* configuration, managed secrets, the action log and the provider caches — in this one
|
|
12
|
+
* database, so a missing binding has to stop startup rather than silently produce an
|
|
13
|
+
* instance that forgets everything it was told.
|
|
14
|
+
*/
|
|
15
|
+
export declare const readGitopsDbOptionsFromEnvironment: () => IGitopsDbOptions;
|
|
16
|
+
/**
|
|
17
|
+
* The single document database behind gitops.
|
|
18
|
+
*
|
|
19
|
+
* Every model binds its collection through `GitopsDb.getInstance().getDb()`, so the
|
|
20
|
+
* singleton is the only place that knows the connection. Tests construct it with an
|
|
21
|
+
* explicit binding to an isolated server; the application reads the binding from the
|
|
22
|
+
* environment.
|
|
23
|
+
*/
|
|
24
|
+
export declare class GitopsDb {
|
|
25
|
+
private static instance;
|
|
26
|
+
private smartdataDb;
|
|
27
|
+
private readonly options;
|
|
28
|
+
private constructor();
|
|
29
|
+
static getInstance(options?: IGitopsDbOptions): GitopsDb;
|
|
30
|
+
static resetInstance(): void;
|
|
31
|
+
start(): Promise<void>;
|
|
32
|
+
stop(): Promise<void>;
|
|
33
|
+
getDb(): plugins.smartdata.SmartdataDb;
|
|
34
|
+
}
|