@git.zone/cli 3.2.1 → 5.0.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/.smartconfig.json +0 -1
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/classes.gitzoneconfig.js +1 -1
- package/dist_ts/classes.project.js +1 -1
- package/dist_ts/gitzone.cli.js +1 -1
- package/dist_ts/gitzone.logging.js +1 -1
- package/dist_ts/helpers.changelog.js +1 -1
- package/dist_ts/helpers.climode.js +1 -1
- package/dist_ts/helpers.smartconfig.js +61 -11
- package/dist_ts/helpers.smartconfigmigrations.js +1 -1
- package/dist_ts/helpers.tsdocker.js +1 -1
- package/dist_ts/helpers.workflow.d.ts +0 -2
- package/dist_ts/helpers.workflow.js +23 -12
- package/dist_ts/index.js +1 -1
- package/dist_ts/mod_audit/index.js +1 -1
- package/dist_ts/mod_commit/index.js +1 -1
- package/dist_ts/mod_commit/mod.helpers.d.ts +3 -3
- package/dist_ts/mod_commit/mod.helpers.js +10 -10
- package/dist_ts/mod_commit/mod.plugins.js +1 -1
- package/dist_ts/mod_commit/mod.ui.js +1 -1
- package/dist_ts/mod_config/classes.commitconfig.js +1 -1
- package/dist_ts/mod_config/classes.releaseconfig.js +1 -1
- package/dist_ts/mod_config/index.js +23 -24
- package/dist_ts/mod_config/mod.plugins.js +1 -1
- package/dist_ts/mod_deprecate/index.js +1 -1
- package/dist_ts/mod_deprecate/mod.plugins.js +1 -1
- package/dist_ts/mod_docker/classes.dockerpruner.js +7 -1
- package/dist_ts/mod_docker/index.js +1 -1
- package/dist_ts/mod_docker/mod.plugins.js +1 -1
- package/dist_ts/mod_format/classes.baseformatter.js +1 -1
- package/dist_ts/mod_format/classes.diffreporter.js +1 -1
- package/dist_ts/mod_format/classes.formatcontext.js +1 -1
- package/dist_ts/mod_format/classes.formatplanner.js +1 -1
- package/dist_ts/mod_format/classes.formatstats.js +1 -1
- package/dist_ts/mod_format/formatters/assets.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/cleanup.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/copy.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/gitignore.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/license.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/packagejson.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/prettier.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/readme.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/smartconfig.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/templates.formatter.js +1 -1
- package/dist_ts/mod_format/formatters/tsconfig.formatter.js +1 -1
- package/dist_ts/mod_format/index.js +1 -1
- package/dist_ts/mod_format/interfaces.format.js +1 -1
- package/dist_ts/mod_format/mod.plugins.js +1 -1
- package/dist_ts/mod_helpers/index.js +1 -1
- package/dist_ts/mod_helpers/mod.plugins.js +1 -1
- package/dist_ts/mod_meta/index.js +1 -1
- package/dist_ts/mod_meta/meta.classes.meta.js +1 -1
- package/dist_ts/mod_meta/meta.interfaces.js +1 -1
- package/dist_ts/mod_meta/meta.plugins.js +1 -1
- package/dist_ts/mod_open/index.js +1 -1
- package/dist_ts/mod_open/mod.plugins.js +1 -1
- package/dist_ts/mod_release/helpers.releasebranch.d.ts +46 -0
- package/dist_ts/mod_release/helpers.releasebranch.js +579 -0
- package/dist_ts/mod_release/index.d.ts +10 -0
- package/dist_ts/mod_release/index.js +300 -92
- package/dist_ts/mod_release/mod.plugins.js +1 -1
- package/dist_ts/mod_services/classes.dockercontainer.d.ts +50 -3
- package/dist_ts/mod_services/classes.dockercontainer.js +646 -84
- package/dist_ts/mod_services/classes.globalregistry.d.ts +10 -24
- package/dist_ts/mod_services/classes.globalregistry.js +210 -62
- package/dist_ts/mod_services/classes.globalregistrystore.d.ts +48 -0
- package/dist_ts/mod_services/classes.globalregistrystore.js +156 -0
- package/dist_ts/mod_services/classes.interprocesslock.d.ts +21 -0
- package/dist_ts/mod_services/classes.interprocesslock.js +141 -0
- package/dist_ts/mod_services/classes.serviceconfiguration.d.ts +15 -12
- package/dist_ts/mod_services/classes.serviceconfiguration.js +188 -91
- package/dist_ts/mod_services/classes.servicedatamarker.d.ts +32 -7
- package/dist_ts/mod_services/classes.servicedatamarker.js +145 -49
- package/dist_ts/mod_services/classes.servicemanager.d.ts +70 -28
- package/dist_ts/mod_services/classes.servicemanager.js +995 -421
- package/dist_ts/mod_services/classes.servicenames.d.ts +8 -0
- package/dist_ts/mod_services/classes.servicenames.js +54 -0
- package/dist_ts/mod_services/classes.serviceoptions.js +1 -1
- package/dist_ts/mod_services/classes.servicepruner.d.ts +3 -0
- package/dist_ts/mod_services/classes.servicepruner.js +208 -46
- package/dist_ts/mod_services/helpers.js +1 -1
- package/dist_ts/mod_services/index.d.ts +2 -0
- package/dist_ts/mod_services/index.js +81 -58
- package/dist_ts/mod_services/mod.plugins.js +1 -1
- package/dist_ts/mod_standard/index.js +2 -2
- package/dist_ts/mod_standard/mod.plugins.js +1 -1
- package/dist_ts/mod_start/index.js +1 -1
- package/dist_ts/mod_start/mod.plugins.js +1 -1
- package/dist_ts/mod_template/index.js +1 -1
- package/dist_ts/mod_template/mod.plugins.js +1 -1
- package/dist_ts/mod_tools/classes.packagemanager.js +1 -1
- package/dist_ts/mod_tools/index.js +1 -1
- package/dist_ts/mod_tools/mod.plugins.js +1 -1
- package/dist_ts/paths.js +1 -1
- package/dist_ts/plugins.d.ts +3 -1
- package/dist_ts/plugins.js +4 -2
- package/dist_ts_migration/001.service-selection.d.ts +9 -0
- package/dist_ts_migration/001.service-selection.js +51 -0
- package/dist_ts_migration/002.runtime-config.d.ts +19 -0
- package/dist_ts_migration/002.runtime-config.js +170 -0
- package/dist_ts_migration/003.service-data-marker.d.ts +9 -0
- package/dist_ts_migration/003.service-data-marker.js +156 -0
- package/dist_ts_migration/004.global-registry.d.ts +13 -0
- package/dist_ts_migration/004.global-registry.js +165 -0
- package/dist_ts_migration/index.d.ts +11 -0
- package/dist_ts_migration/index.js +59 -0
- package/package.json +6 -3
- package/readme.hints.md +102 -25
- package/readme.md +144 -41
- package/readme.plan.md +29 -16
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/helpers.smartconfig.ts +63 -10
- package/ts/helpers.workflow.ts +41 -12
- package/ts/mod_commit/mod.helpers.ts +12 -8
- package/ts/mod_config/index.ts +22 -23
- package/ts/mod_docker/classes.dockerpruner.ts +6 -0
- package/ts/mod_release/helpers.releasebranch.ts +1282 -0
- package/ts/mod_release/index.ts +608 -129
- package/ts/mod_services/classes.dockercontainer.ts +912 -96
- package/ts/mod_services/classes.globalregistry.ts +290 -89
- package/ts/mod_services/classes.globalregistrystore.ts +279 -0
- package/ts/mod_services/classes.interprocesslock.ts +189 -0
- package/ts/mod_services/classes.serviceconfiguration.ts +215 -108
- package/ts/mod_services/classes.servicedatamarker.ts +210 -52
- package/ts/mod_services/classes.servicemanager.ts +1332 -512
- package/ts/mod_services/classes.servicenames.ts +76 -0
- package/ts/mod_services/classes.servicepruner.ts +310 -52
- package/ts/mod_services/index.ts +89 -62
- package/ts/mod_standard/index.ts +1 -1
- package/ts/plugins.ts +4 -0
- package/ts_migration/001.service-selection.ts +77 -0
- package/ts_migration/002.runtime-config.ts +218 -0
- package/ts_migration/003.service-data-marker.ts +216 -0
- package/ts_migration/004.global-registry.ts +272 -0
- package/ts_migration/index.ts +83 -0
|
@@ -6,14 +6,20 @@
|
|
|
6
6
|
* `@git.zone/tsdeploy` (`deriveRequiredCapabilities`), so the strings and the
|
|
7
7
|
* array shape must never change here.
|
|
8
8
|
*/
|
|
9
|
-
export type TServiceName = 'mongodb' | '
|
|
9
|
+
export type TServiceName = 'mongodb' | 'objectstorage' | 'elasticsearch';
|
|
10
|
+
export type TLegacyServiceName = 'minio';
|
|
10
11
|
export declare const serviceNames: TServiceName[];
|
|
12
|
+
export declare const objectStorageImage = "code.foss.global/lossless.zone/objectstorage@sha256:43b60897eed17b54feb4e363808ce540ed1d9d27201871c5c8a869300d41e1b8";
|
|
11
13
|
/** Owner recorded in markers and container labels. */
|
|
12
14
|
export declare const serviceDataOwner = "@git.zone/cli";
|
|
13
15
|
/** Value of the `git.zone.tool` label on containers created by `gitzone services`. */
|
|
14
16
|
export declare const serviceToolLabel = "gitzone-services";
|
|
15
17
|
/** Marker file name, stored in `<projectPath>/.nogit/`. */
|
|
16
18
|
export declare const serviceDataMarkerFile = ".gitzone-services.json";
|
|
19
|
+
export declare const serviceDataMarkerSchemaVersion = 2;
|
|
20
|
+
export declare const legacyMinioDataDirectoryName = "miniodata";
|
|
21
|
+
export declare const serviceOperationLabel = "git.zone.operation";
|
|
22
|
+
export declare const serviceBindOperation = "service-bind-operation";
|
|
17
23
|
/**
|
|
18
24
|
* Directory basename used below `.nogit/` for each service's bind-mounted data.
|
|
19
25
|
* This mapping is the only shape `gitzone services` ever creates, and prune
|
|
@@ -24,7 +30,7 @@ export declare const serviceDataDirectoryNames: {
|
|
|
24
30
|
};
|
|
25
31
|
/**
|
|
26
32
|
* Image used to run each service, and therefore the image available to perform
|
|
27
|
-
* a
|
|
33
|
+
* a root-helper cleanup of that service's data directory: if the data exists,
|
|
28
34
|
* the service ran, so its image is present locally.
|
|
29
35
|
*/
|
|
30
36
|
export declare const serviceImages: {
|
|
@@ -37,22 +43,31 @@ export interface IServiceDataMarkerEntry {
|
|
|
37
43
|
export interface IServiceDataMarker {
|
|
38
44
|
owner: string;
|
|
39
45
|
kind: 'service-data';
|
|
40
|
-
schemaVersion:
|
|
46
|
+
schemaVersion: 2;
|
|
41
47
|
projectPath: string;
|
|
42
48
|
safeToPrune: true;
|
|
43
49
|
createdAt: string;
|
|
44
50
|
dataDirectories: IServiceDataMarkerEntry[];
|
|
51
|
+
legacyDataDirectories?: ILegacyServiceDataMarkerEntry[];
|
|
52
|
+
}
|
|
53
|
+
export interface ILegacyServiceDataMarkerEntry {
|
|
54
|
+
service: TLegacyServiceName;
|
|
55
|
+
path: string;
|
|
56
|
+
safeToPrune: false;
|
|
45
57
|
}
|
|
46
58
|
/** Absolute path of the marker file for a project. */
|
|
47
59
|
export declare const getServiceDataMarkerPath: (projectPathArg: string) => string;
|
|
60
|
+
export declare const getServiceDataMarkerLockPath: (projectPathArg: string) => string;
|
|
48
61
|
/**
|
|
49
62
|
* Expected absolute data directory path for a service in a project.
|
|
50
63
|
* `mod_services` must always derive data paths through this helper so that
|
|
51
64
|
* creation and reclamation agree on a single shape.
|
|
52
65
|
*/
|
|
53
66
|
export declare const getServiceDataDirectory: (projectPathArg: string, serviceArg: TServiceName) => string;
|
|
67
|
+
/** Exact legacy path retained only for migration detection. */
|
|
68
|
+
export declare const getLegacyMinioDataDirectory: (projectPathArg: string) => string;
|
|
54
69
|
/**
|
|
55
|
-
* True only when `candidatePathArg` is exactly one of the
|
|
70
|
+
* True only when `candidatePathArg` is exactly one of the canonical data
|
|
56
71
|
* directories `gitzone services` creates for `projectPathArg`.
|
|
57
72
|
*
|
|
58
73
|
* This is an allowlist, not a denylist: any path that is not byte-for-byte one
|
|
@@ -60,16 +75,17 @@ export declare const getServiceDataDirectory: (projectPathArg: string, serviceAr
|
|
|
60
75
|
* before a recursive delete.
|
|
61
76
|
*/
|
|
62
77
|
export declare const isSafeServiceDataPath: (projectPathArg: string, candidatePathArg: string) => boolean;
|
|
63
|
-
/** Validate an unknown value as a
|
|
78
|
+
/** Validate an unknown value as a canonical v2 marker. */
|
|
64
79
|
export declare const isValidServiceDataMarker: (markerArg: unknown) => markerArg is IServiceDataMarker;
|
|
65
80
|
/** Read and validate the marker for a project, or undefined when absent/invalid. */
|
|
66
81
|
export declare const readServiceDataMarker: (projectPathArg: string) => Promise<IServiceDataMarker | undefined>;
|
|
82
|
+
export declare const markerProvesServiceDataDirectory: (markerArg: IServiceDataMarker | undefined, projectPathArg: string, serviceArg: TServiceName) => boolean;
|
|
67
83
|
/**
|
|
68
84
|
* Record that `gitzone services` owns a data directory for this project.
|
|
69
85
|
*
|
|
70
86
|
* The marker lives in `.nogit/` rather than inside the bind-mounted data
|
|
71
|
-
* directory itself, so it can never confuse
|
|
72
|
-
*
|
|
87
|
+
* directory itself, so it can never confuse a service runtime. Entries are
|
|
88
|
+
* merged so enabling a service later does not drop the
|
|
73
89
|
* claim on previously created directories.
|
|
74
90
|
*/
|
|
75
91
|
export declare const recordServiceDataDirectory: (projectPathArg: string, serviceArg: TServiceName) => Promise<void>;
|
|
@@ -87,7 +103,16 @@ export declare const getServiceContainerLabels: (optionsArg: {
|
|
|
87
103
|
}) => {
|
|
88
104
|
[key: string]: string;
|
|
89
105
|
};
|
|
106
|
+
export declare const hasExactServiceContainerLabels: (labelsArg: Record<string, string>, expectedArg: Record<string, string>) => boolean;
|
|
90
107
|
/** True when a container's labels prove `gitzone services` created it. */
|
|
91
108
|
export declare const isServiceOwnedByLabels: (labelsArg: {
|
|
92
109
|
[key: string]: string;
|
|
93
110
|
}) => boolean;
|
|
111
|
+
/** Legacy provider evidence is retained for migration, never active lifecycle ownership. */
|
|
112
|
+
export declare const isLegacyMinioContainerLabels: (labelsArg: {
|
|
113
|
+
[key: string]: string;
|
|
114
|
+
}) => boolean;
|
|
115
|
+
/** Transient bind-operation containers are owned by their invocation, not by prune. */
|
|
116
|
+
export declare const isServiceOperationHelperLabels: (labelsArg: {
|
|
117
|
+
[key: string]: string;
|
|
118
|
+
}) => boolean;
|
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
import * as plugins from './mod.plugins.js';
|
|
2
|
-
|
|
2
|
+
import { withInterProcessLock } from './classes.interprocesslock.js';
|
|
3
|
+
export const serviceNames = ['mongodb', 'objectstorage', 'elasticsearch'];
|
|
4
|
+
export const objectStorageImage = 'code.foss.global/lossless.zone/objectstorage@sha256:43b60897eed17b54feb4e363808ce540ed1d9d27201871c5c8a869300d41e1b8';
|
|
3
5
|
/** Owner recorded in markers and container labels. */
|
|
4
6
|
export const serviceDataOwner = '@git.zone/cli';
|
|
5
7
|
/** Value of the `git.zone.tool` label on containers created by `gitzone services`. */
|
|
6
8
|
export const serviceToolLabel = 'gitzone-services';
|
|
7
9
|
/** Marker file name, stored in `<projectPath>/.nogit/`. */
|
|
8
10
|
export const serviceDataMarkerFile = '.gitzone-services.json';
|
|
11
|
+
export const serviceDataMarkerSchemaVersion = 2;
|
|
12
|
+
export const legacyMinioDataDirectoryName = 'miniodata';
|
|
13
|
+
export const serviceOperationLabel = 'git.zone.operation';
|
|
14
|
+
export const serviceBindOperation = 'service-bind-operation';
|
|
9
15
|
/**
|
|
10
16
|
* Directory basename used below `.nogit/` for each service's bind-mounted data.
|
|
11
17
|
* This mapping is the only shape `gitzone services` ever creates, and prune
|
|
@@ -13,26 +19,30 @@ export const serviceDataMarkerFile = '.gitzone-services.json';
|
|
|
13
19
|
*/
|
|
14
20
|
export const serviceDataDirectoryNames = {
|
|
15
21
|
mongodb: 'mongodata',
|
|
16
|
-
|
|
22
|
+
objectstorage: 'objectstoragedata',
|
|
17
23
|
elasticsearch: 'esdata',
|
|
18
24
|
};
|
|
19
25
|
/**
|
|
20
26
|
* Image used to run each service, and therefore the image available to perform
|
|
21
|
-
* a
|
|
27
|
+
* a root-helper cleanup of that service's data directory: if the data exists,
|
|
22
28
|
* the service ran, so its image is present locally.
|
|
23
29
|
*/
|
|
24
30
|
export const serviceImages = {
|
|
25
31
|
mongodb: 'mongo:7.0',
|
|
26
|
-
|
|
32
|
+
objectstorage: objectStorageImage,
|
|
27
33
|
elasticsearch: 'elasticsearch:8.11.0',
|
|
28
34
|
};
|
|
29
35
|
const isPlainObject = (value) => {
|
|
30
36
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
31
37
|
};
|
|
38
|
+
const hasOnlyKeys = (valueArg, allowedKeysArg) => Object.keys(valueArg).every((keyArg) => allowedKeysArg.includes(keyArg));
|
|
32
39
|
/** Absolute path of the marker file for a project. */
|
|
33
40
|
export const getServiceDataMarkerPath = (projectPathArg) => {
|
|
34
41
|
return plugins.path.join(plugins.path.resolve(projectPathArg), '.nogit', serviceDataMarkerFile);
|
|
35
42
|
};
|
|
43
|
+
export const getServiceDataMarkerLockPath = (projectPathArg) => {
|
|
44
|
+
return `${getServiceDataMarkerPath(projectPathArg)}.lock`;
|
|
45
|
+
};
|
|
36
46
|
/**
|
|
37
47
|
* Expected absolute data directory path for a service in a project.
|
|
38
48
|
* `mod_services` must always derive data paths through this helper so that
|
|
@@ -41,8 +51,12 @@ export const getServiceDataMarkerPath = (projectPathArg) => {
|
|
|
41
51
|
export const getServiceDataDirectory = (projectPathArg, serviceArg) => {
|
|
42
52
|
return plugins.path.join(plugins.path.resolve(projectPathArg), '.nogit', serviceDataDirectoryNames[serviceArg]);
|
|
43
53
|
};
|
|
54
|
+
/** Exact legacy path retained only for migration detection. */
|
|
55
|
+
export const getLegacyMinioDataDirectory = (projectPathArg) => {
|
|
56
|
+
return plugins.path.join(plugins.path.resolve(projectPathArg), '.nogit', legacyMinioDataDirectoryName);
|
|
57
|
+
};
|
|
44
58
|
/**
|
|
45
|
-
* True only when `candidatePathArg` is exactly one of the
|
|
59
|
+
* True only when `candidatePathArg` is exactly one of the canonical data
|
|
46
60
|
* directories `gitzone services` creates for `projectPathArg`.
|
|
47
61
|
*
|
|
48
62
|
* This is an allowlist, not a denylist: any path that is not byte-for-byte one
|
|
@@ -58,31 +72,39 @@ export const isSafeServiceDataPath = (projectPathArg, candidatePathArg) => {
|
|
|
58
72
|
}
|
|
59
73
|
return false;
|
|
60
74
|
};
|
|
61
|
-
|
|
75
|
+
const hasValidMarkerEnvelope = (markerArg) => {
|
|
76
|
+
return (markerArg.owner === serviceDataOwner &&
|
|
77
|
+
markerArg.kind === 'service-data' &&
|
|
78
|
+
markerArg.safeToPrune === true &&
|
|
79
|
+
typeof markerArg.projectPath === 'string' &&
|
|
80
|
+
markerArg.projectPath.length > 0 &&
|
|
81
|
+
typeof markerArg.createdAt === 'string' &&
|
|
82
|
+
markerArg.createdAt.length > 0 &&
|
|
83
|
+
Array.isArray(markerArg.dataDirectories));
|
|
84
|
+
};
|
|
85
|
+
/** Validate an unknown value as a canonical v2 marker. */
|
|
62
86
|
export const isValidServiceDataMarker = (markerArg) => {
|
|
63
87
|
if (!isPlainObject(markerArg)) {
|
|
64
88
|
return false;
|
|
65
89
|
}
|
|
66
|
-
if (markerArg
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
if (typeof markerArg.projectPath !== 'string' || !markerArg.projectPath) {
|
|
79
|
-
return false;
|
|
80
|
-
}
|
|
81
|
-
if (!Array.isArray(markerArg.dataDirectories)) {
|
|
90
|
+
if (!hasOnlyKeys(markerArg, [
|
|
91
|
+
'owner',
|
|
92
|
+
'kind',
|
|
93
|
+
'schemaVersion',
|
|
94
|
+
'projectPath',
|
|
95
|
+
'safeToPrune',
|
|
96
|
+
'createdAt',
|
|
97
|
+
'dataDirectories',
|
|
98
|
+
'legacyDataDirectories',
|
|
99
|
+
]) ||
|
|
100
|
+
!hasValidMarkerEnvelope(markerArg) ||
|
|
101
|
+
markerArg.schemaVersion !== serviceDataMarkerSchemaVersion) {
|
|
82
102
|
return false;
|
|
83
103
|
}
|
|
104
|
+
const projectPath = plugins.path.resolve(markerArg.projectPath);
|
|
105
|
+
const seenServices = new Set();
|
|
84
106
|
for (const entry of markerArg.dataDirectories) {
|
|
85
|
-
if (!isPlainObject(entry)) {
|
|
107
|
+
if (!isPlainObject(entry) || !hasOnlyKeys(entry, ['service', 'path'])) {
|
|
86
108
|
return false;
|
|
87
109
|
}
|
|
88
110
|
if (!serviceNames.includes(entry.service)) {
|
|
@@ -91,9 +113,52 @@ export const isValidServiceDataMarker = (markerArg) => {
|
|
|
91
113
|
if (typeof entry.path !== 'string' || !entry.path) {
|
|
92
114
|
return false;
|
|
93
115
|
}
|
|
116
|
+
if (seenServices.has(entry.service) ||
|
|
117
|
+
plugins.path.resolve(entry.path) !== getServiceDataDirectory(projectPath, entry.service)) {
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
seenServices.add(entry.service);
|
|
121
|
+
}
|
|
122
|
+
if (markerArg.legacyDataDirectories !== undefined) {
|
|
123
|
+
if (!Array.isArray(markerArg.legacyDataDirectories)) {
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
for (const entry of markerArg.legacyDataDirectories) {
|
|
127
|
+
if (!isPlainObject(entry) ||
|
|
128
|
+
!hasOnlyKeys(entry, ['service', 'path', 'safeToPrune']) ||
|
|
129
|
+
entry.service !== 'minio' ||
|
|
130
|
+
entry.safeToPrune !== false ||
|
|
131
|
+
typeof entry.path !== 'string' ||
|
|
132
|
+
plugins.path.resolve(entry.path) !== getLegacyMinioDataDirectory(projectPath)) {
|
|
133
|
+
return false;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
if (markerArg.legacyDataDirectories.length > 1) {
|
|
137
|
+
return false;
|
|
138
|
+
}
|
|
94
139
|
}
|
|
95
140
|
return true;
|
|
96
141
|
};
|
|
142
|
+
const writeServiceDataMarker = async (projectPathArg, markerArg) => {
|
|
143
|
+
const markerPath = getServiceDataMarkerPath(projectPathArg);
|
|
144
|
+
await plugins.smartfs.directory(plugins.path.dirname(markerPath)).recursive().create();
|
|
145
|
+
const tempPath = `${markerPath}.tmp-${process.pid}-${plugins.crypto
|
|
146
|
+
.randomBytes(12)
|
|
147
|
+
.toString('hex')}`;
|
|
148
|
+
try {
|
|
149
|
+
await plugins.fs.writeFile(tempPath, `${JSON.stringify(markerArg, null, 2)}\n`, {
|
|
150
|
+
encoding: 'utf8',
|
|
151
|
+
flag: 'wx',
|
|
152
|
+
});
|
|
153
|
+
await plugins.fs.rename(tempPath, markerPath);
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
await plugins.fs.rm(tempPath, { force: true }).catch(() => { });
|
|
157
|
+
throw new Error(`Could not persist service data marker atomically: ${markerPath}`, {
|
|
158
|
+
cause: error,
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
};
|
|
97
162
|
/** Read and validate the marker for a project, or undefined when absent/invalid. */
|
|
98
163
|
export const readServiceDataMarker = async (projectPathArg) => {
|
|
99
164
|
const markerPath = getServiceDataMarkerPath(projectPathArg);
|
|
@@ -103,44 +168,59 @@ export const readServiceDataMarker = async (projectPathArg) => {
|
|
|
103
168
|
}
|
|
104
169
|
const content = (await plugins.smartfs.file(markerPath).encoding('utf8').read());
|
|
105
170
|
const parsed = JSON.parse(content);
|
|
106
|
-
return isValidServiceDataMarker(parsed)
|
|
171
|
+
return isValidServiceDataMarker(parsed) &&
|
|
172
|
+
plugins.path.resolve(parsed.projectPath) === plugins.path.resolve(projectPathArg)
|
|
173
|
+
? parsed
|
|
174
|
+
: undefined;
|
|
107
175
|
}
|
|
108
176
|
catch {
|
|
109
177
|
return undefined;
|
|
110
178
|
}
|
|
111
179
|
};
|
|
180
|
+
export const markerProvesServiceDataDirectory = (markerArg, projectPathArg, serviceArg) => {
|
|
181
|
+
const expectedPath = getServiceDataDirectory(projectPathArg, serviceArg);
|
|
182
|
+
return !!markerArg?.dataDirectories.some((entry) => entry.service === serviceArg && plugins.path.resolve(entry.path) === expectedPath);
|
|
183
|
+
};
|
|
112
184
|
/**
|
|
113
185
|
* Record that `gitzone services` owns a data directory for this project.
|
|
114
186
|
*
|
|
115
187
|
* The marker lives in `.nogit/` rather than inside the bind-mounted data
|
|
116
|
-
* directory itself, so it can never confuse
|
|
117
|
-
*
|
|
188
|
+
* directory itself, so it can never confuse a service runtime. Entries are
|
|
189
|
+
* merged so enabling a service later does not drop the
|
|
118
190
|
* claim on previously created directories.
|
|
119
191
|
*/
|
|
120
192
|
export const recordServiceDataDirectory = async (projectPathArg, serviceArg) => {
|
|
121
193
|
const projectPath = plugins.path.resolve(projectPathArg);
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
194
|
+
await withInterProcessLock({
|
|
195
|
+
lockPath: getServiceDataMarkerLockPath(projectPath),
|
|
196
|
+
description: 'Service data marker',
|
|
197
|
+
}, async () => {
|
|
198
|
+
const dataPath = getServiceDataDirectory(projectPath, serviceArg);
|
|
199
|
+
const markerPath = getServiceDataMarkerPath(projectPath);
|
|
200
|
+
const markerExists = await plugins.smartfs.file(markerPath).exists();
|
|
201
|
+
const existingMarker = await readServiceDataMarker(projectPath);
|
|
202
|
+
if (markerExists && !existingMarker) {
|
|
203
|
+
throw new Error(`Refusing to overwrite invalid or foreign service data marker: ${markerPath}`);
|
|
204
|
+
}
|
|
205
|
+
const entries = existingMarker
|
|
206
|
+
? existingMarker.dataDirectories.filter((entry) => entry.service !== serviceArg)
|
|
207
|
+
: [];
|
|
208
|
+
entries.push({ service: serviceArg, path: dataPath });
|
|
209
|
+
entries.sort((entryA, entryB) => entryA.service.localeCompare(entryB.service));
|
|
210
|
+
const marker = {
|
|
211
|
+
owner: serviceDataOwner,
|
|
212
|
+
kind: 'service-data',
|
|
213
|
+
schemaVersion: serviceDataMarkerSchemaVersion,
|
|
214
|
+
projectPath,
|
|
215
|
+
safeToPrune: true,
|
|
216
|
+
createdAt: existingMarker?.createdAt || new Date().toISOString(),
|
|
217
|
+
dataDirectories: entries,
|
|
218
|
+
...(existingMarker?.legacyDataDirectories
|
|
219
|
+
? { legacyDataDirectories: existingMarker.legacyDataDirectories }
|
|
220
|
+
: {}),
|
|
221
|
+
};
|
|
222
|
+
await writeServiceDataMarker(projectPath, marker);
|
|
223
|
+
});
|
|
144
224
|
};
|
|
145
225
|
/**
|
|
146
226
|
* Labels applied to every container `gitzone services` creates.
|
|
@@ -158,9 +238,25 @@ export const getServiceContainerLabels = (optionsArg) => {
|
|
|
158
238
|
'git.zone.safe-to-prune': 'true',
|
|
159
239
|
};
|
|
160
240
|
};
|
|
241
|
+
export const hasExactServiceContainerLabels = (labelsArg, expectedArg) => {
|
|
242
|
+
const actualGitZoneLabels = Object.entries(labelsArg).filter(([key]) => key.startsWith('git.zone.'));
|
|
243
|
+
const expectedGitZoneLabels = Object.entries(expectedArg).filter(([key]) => key.startsWith('git.zone.'));
|
|
244
|
+
return (actualGitZoneLabels.length === expectedGitZoneLabels.length &&
|
|
245
|
+
expectedGitZoneLabels.every(([key, value]) => labelsArg[key] === value));
|
|
246
|
+
};
|
|
161
247
|
/** True when a container's labels prove `gitzone services` created it. */
|
|
162
248
|
export const isServiceOwnedByLabels = (labelsArg) => {
|
|
163
249
|
return (labelsArg['git.zone.tool'] === serviceToolLabel &&
|
|
164
250
|
labelsArg['git.zone.safe-to-prune'] === 'true');
|
|
165
251
|
};
|
|
166
|
-
|
|
252
|
+
/** Legacy provider evidence is retained for migration, never active lifecycle ownership. */
|
|
253
|
+
export const isLegacyMinioContainerLabels = (labelsArg) => {
|
|
254
|
+
return (labelsArg['git.zone.tool'] === serviceToolLabel &&
|
|
255
|
+
labelsArg['git.zone.service'] === 'minio');
|
|
256
|
+
};
|
|
257
|
+
/** Transient bind-operation containers are owned by their invocation, not by prune. */
|
|
258
|
+
export const isServiceOperationHelperLabels = (labelsArg) => {
|
|
259
|
+
return (labelsArg['git.zone.tool'] === serviceToolLabel &&
|
|
260
|
+
labelsArg[serviceOperationLabel] === serviceBindOperation);
|
|
261
|
+
};
|
|
262
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.servicedatamarker.js","sourceRoot":"","sources":["../../../ts/mod_services/classes.servicedatamarker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import * as plugins from './mod.plugins.js';
|
|
1
2
|
import { ServiceConfiguration } from './classes.serviceconfiguration.js';
|
|
2
|
-
import { DockerContainer } from './classes.dockercontainer.js';
|
|
3
3
|
import { type TServiceName } from './classes.servicedatamarker.js';
|
|
4
|
+
import { type TServiceMigrationScope } from '../../dist_ts_migration/index.js';
|
|
4
5
|
import type { ContainerStatus } from './classes.dockercontainer.js';
|
|
5
6
|
import type { TServiceOptionSource } from './classes.serviceoptions.js';
|
|
6
7
|
export interface IServiceStatus {
|
|
@@ -18,7 +19,12 @@ export interface IServiceStatus {
|
|
|
18
19
|
authEnabled?: boolean;
|
|
19
20
|
/** MongoDB only: whether the auth mode is declared in committed config. */
|
|
20
21
|
authSource?: TServiceOptionSource;
|
|
22
|
+
/** ObjectStorage only: an unowned same-name container is a conflict, not managed state. */
|
|
23
|
+
ownership?: 'owned' | 'conflict' | 'absent';
|
|
24
|
+
managementUi?: string;
|
|
21
25
|
}
|
|
26
|
+
export type TServiceManagerOperation = 'auth' | 'clean' | 'compass' | 'config' | 'logs' | 'remove' | 'reconfigure' | 'restart' | 'start' | 'status' | 'stop';
|
|
27
|
+
export declare const getServiceManagerMigrationScopes: (operationArg: TServiceManagerOperation) => TServiceMigrationScope[];
|
|
22
28
|
export interface IServicesStatus {
|
|
23
29
|
project: {
|
|
24
30
|
name: string;
|
|
@@ -27,9 +33,14 @@ export interface IServicesStatus {
|
|
|
27
33
|
};
|
|
28
34
|
services: {
|
|
29
35
|
mongodb: IServiceStatus;
|
|
30
|
-
|
|
36
|
+
objectstorage: IServiceStatus;
|
|
31
37
|
elasticsearch: IServiceStatus;
|
|
32
38
|
};
|
|
39
|
+
legacy: {
|
|
40
|
+
minioContainer?: string;
|
|
41
|
+
minioDataDirectory: string;
|
|
42
|
+
minioDataExists: boolean;
|
|
43
|
+
};
|
|
33
44
|
totalDataBytes: number;
|
|
34
45
|
}
|
|
35
46
|
export declare const mongoServiceUlimits: {
|
|
@@ -38,33 +49,47 @@ export declare const mongoServiceUlimits: {
|
|
|
38
49
|
readonly hard: 65536;
|
|
39
50
|
};
|
|
40
51
|
};
|
|
41
|
-
export declare const
|
|
42
|
-
export interface
|
|
52
|
+
export declare const objectStorageReconciliationTimeoutMs = 30000;
|
|
53
|
+
export interface IObjectStorageReconciliationClock {
|
|
43
54
|
now(): number;
|
|
44
55
|
delay(millisecondsArg: number): Promise<void>;
|
|
45
56
|
}
|
|
46
|
-
export interface
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
57
|
+
export interface IObjectStorageBucketReconciliationOptions {
|
|
58
|
+
smartBucket: Pick<plugins.smartbucket.SmartBucket, 'checkReadiness' | 'close'> & {
|
|
59
|
+
storageClient: {
|
|
60
|
+
send(commandArg: plugins.s3.HeadBucketCommand | plugins.s3.CreateBucketCommand, optionsArg?: {
|
|
61
|
+
abortSignal?: AbortSignal;
|
|
62
|
+
}): Promise<unknown>;
|
|
63
|
+
};
|
|
64
|
+
};
|
|
50
65
|
bucket: string;
|
|
51
|
-
/** Shared absolute deadline. Defaults to 30 seconds from this call. */
|
|
52
66
|
deadlineAt?: number;
|
|
53
|
-
clock?:
|
|
67
|
+
clock?: IObjectStorageReconciliationClock;
|
|
54
68
|
}
|
|
55
|
-
|
|
56
|
-
export declare const
|
|
69
|
+
export declare const objectStorageExpectedEntrypoint: string[];
|
|
70
|
+
export declare const objectStorageExpectedCommand: string[];
|
|
71
|
+
export declare const objectStorageExpectedHealthcheck: {
|
|
72
|
+
test: string[];
|
|
73
|
+
interval: number;
|
|
74
|
+
timeout: number;
|
|
75
|
+
startPeriod: number;
|
|
76
|
+
retries: number;
|
|
77
|
+
};
|
|
78
|
+
/** Create the configured bucket only after an authenticated 404, then verify by HEAD. */
|
|
79
|
+
export declare const reconcileObjectStorageBucket: (optionsArg: IObjectStorageBucketReconciliationOptions) => Promise<void>;
|
|
57
80
|
export declare class ServiceManager {
|
|
58
81
|
private config;
|
|
59
82
|
private docker;
|
|
60
83
|
private enabledServices;
|
|
61
84
|
private globalRegistry;
|
|
62
|
-
private
|
|
85
|
+
private objectStorageClock;
|
|
86
|
+
private fetchImplementation;
|
|
87
|
+
private smartBucketFactory;
|
|
63
88
|
constructor();
|
|
64
89
|
/**
|
|
65
90
|
* Initialize the service manager
|
|
66
91
|
*/
|
|
67
|
-
init(): Promise<void>;
|
|
92
|
+
init(operationArg: TServiceManagerOperation): Promise<void>;
|
|
68
93
|
/**
|
|
69
94
|
* Human phrasing for where the auth mode came from. A declared auth-off is
|
|
70
95
|
* committed to the repository and therefore affects everyone who clones it,
|
|
@@ -86,7 +111,7 @@ export declare class ServiceManager {
|
|
|
86
111
|
/**
|
|
87
112
|
* Check if a service is enabled
|
|
88
113
|
*/
|
|
89
|
-
|
|
114
|
+
isServiceEnabled(service: TServiceName): boolean;
|
|
90
115
|
/**
|
|
91
116
|
* Prepare a service's data directory: create it and record tool ownership.
|
|
92
117
|
*
|
|
@@ -94,6 +119,7 @@ export declare class ServiceManager {
|
|
|
94
119
|
* prove the directory is reclaimable instead of guessing from its path.
|
|
95
120
|
*/
|
|
96
121
|
private prepareDataDirectory;
|
|
122
|
+
private createDataDirectory;
|
|
97
123
|
/**
|
|
98
124
|
* Register this project with the global registry.
|
|
99
125
|
*
|
|
@@ -124,6 +150,8 @@ export declare class ServiceManager {
|
|
|
124
150
|
* (localhost:MONGODB_PORT) is reachable from host and container alike.
|
|
125
151
|
*/
|
|
126
152
|
startMongoDB(): Promise<void>;
|
|
153
|
+
private assertNoPendingDataDeletion;
|
|
154
|
+
private startMongoDBLocked;
|
|
127
155
|
/**
|
|
128
156
|
* Create the MongoDB container as a single-node replica set
|
|
129
157
|
*/
|
|
@@ -150,31 +178,42 @@ export declare class ServiceManager {
|
|
|
150
178
|
* Initiate the single-node replica set once mongod is reachable
|
|
151
179
|
*/
|
|
152
180
|
private ensureMongoReplicaSetInitiated;
|
|
153
|
-
private
|
|
154
|
-
private
|
|
155
|
-
private
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
private
|
|
181
|
+
private inspectObjectStorageContainer;
|
|
182
|
+
private inspectObjectStorageIdentity;
|
|
183
|
+
private discoverContainerIdByExactName;
|
|
184
|
+
private assertObjectStorageOwnership;
|
|
185
|
+
private revalidateObjectStorageContainer;
|
|
186
|
+
private objectStorageConfigurationMatches;
|
|
187
|
+
private assertNoSymlinkedObjectStoragePath;
|
|
188
|
+
private prepareObjectStorageDataDirectory;
|
|
189
|
+
private repairObjectStorageMarkerFromOwnedContainer;
|
|
190
|
+
private assertNoLegacyMinioResources;
|
|
191
|
+
/** Read-only preflight used before restart or reconfigure may stop anything. */
|
|
192
|
+
assertObjectStorageStartupAllowed(): Promise<void>;
|
|
193
|
+
private assertObjectStorageConfigurationSafe;
|
|
194
|
+
private waitForObjectStorageReadiness;
|
|
195
|
+
private createObjectStorageContainer;
|
|
196
|
+
/** Start or reconcile the canonical ObjectStorage service. */
|
|
197
|
+
startObjectStorage(): Promise<void>;
|
|
198
|
+
private startObjectStorageLocked;
|
|
162
199
|
/**
|
|
163
200
|
* Start Elasticsearch service
|
|
164
201
|
*/
|
|
165
202
|
startElasticsearch(): Promise<void>;
|
|
203
|
+
private startElasticsearchLocked;
|
|
166
204
|
/**
|
|
167
205
|
* Stop MongoDB service
|
|
168
206
|
*/
|
|
169
207
|
stopMongoDB(): Promise<void>;
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
208
|
+
private stopMongoDBLocked;
|
|
209
|
+
/** Stop only an exactly owned canonical ObjectStorage container. */
|
|
210
|
+
stopObjectStorage(): Promise<void>;
|
|
211
|
+
private stopObjectStorageLocked;
|
|
174
212
|
/**
|
|
175
213
|
* Stop Elasticsearch service
|
|
176
214
|
*/
|
|
177
215
|
stopElasticsearch(): Promise<void>;
|
|
216
|
+
private stopElasticsearchLocked;
|
|
178
217
|
/**
|
|
179
218
|
* Collect service status as structured data.
|
|
180
219
|
*
|
|
@@ -210,6 +249,8 @@ export declare class ServiceManager {
|
|
|
210
249
|
* Remove containers
|
|
211
250
|
*/
|
|
212
251
|
removeContainers(): Promise<void>;
|
|
252
|
+
private removeContainersLocked;
|
|
253
|
+
private withProjectServiceLocks;
|
|
213
254
|
/**
|
|
214
255
|
* Clean data directories
|
|
215
256
|
*/
|
|
@@ -222,4 +263,5 @@ export declare class ServiceManager {
|
|
|
222
263
|
* Reconfigure services with new ports
|
|
223
264
|
*/
|
|
224
265
|
reconfigure(): Promise<void>;
|
|
266
|
+
private reconfigureLocked;
|
|
225
267
|
}
|