@otwld/nx-helm 0.0.17 → 0.0.18
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/package.json +3 -3
- package/src/executors/commands.d.ts +24 -0
- package/src/executors/commands.js +34 -5
- package/src/executors/commands.js.map +1 -1
- package/src/generators/chart.d.ts +13 -0
- package/src/generators/chart.js +28 -9
- package/src/generators/chart.js.map +1 -1
- package/src/plugin.d.ts +13 -1
- package/src/plugin.js +31 -11
- package/src/plugin.js.map +1 -1
- package/src/release/version-actions.d.ts +32 -2
- package/src/release/version-actions.js +91 -36
- package/src/release/version-actions.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@otwld/nx-helm",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.18",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -23,12 +23,12 @@
|
|
|
23
23
|
"module": "./src/index.js",
|
|
24
24
|
"types": "./src/index.d.ts",
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@nx/devkit": "23.
|
|
26
|
+
"@nx/devkit": "23.2.1",
|
|
27
27
|
"tslib": "^2.8.1",
|
|
28
28
|
"yaml": "2.9.0"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
31
|
-
"nx": "23.
|
|
31
|
+
"nx": "23.2.1"
|
|
32
32
|
},
|
|
33
33
|
"publishConfig": {
|
|
34
34
|
"access": "public"
|
|
@@ -14,8 +14,32 @@ interface PackageOptions {
|
|
|
14
14
|
interface ReleasePublishOptions {
|
|
15
15
|
registry: string;
|
|
16
16
|
}
|
|
17
|
+
/**
|
|
18
|
+
* Runs `helm lint` for an Nx chart project.
|
|
19
|
+
* @param options - Helm lint options.
|
|
20
|
+
* @param context - Nx executor context.
|
|
21
|
+
* @returns Whether Helm lint completed successfully.
|
|
22
|
+
*/
|
|
17
23
|
export declare const lintExecutor: PromiseExecutor<LintOptions>;
|
|
24
|
+
/**
|
|
25
|
+
* Renders an Nx chart with `helm template`.
|
|
26
|
+
* @param options - Helm template options.
|
|
27
|
+
* @param context - Nx executor context.
|
|
28
|
+
* @returns Whether template rendering completed successfully.
|
|
29
|
+
*/
|
|
18
30
|
export declare const templateExecutor: PromiseExecutor<TemplateOptions>;
|
|
31
|
+
/**
|
|
32
|
+
* Packages an Nx chart with `helm package`.
|
|
33
|
+
* @param options - Helm package options.
|
|
34
|
+
* @param context - Nx executor context.
|
|
35
|
+
* @returns Whether chart packaging completed successfully.
|
|
36
|
+
*/
|
|
19
37
|
export declare const packageExecutor: PromiseExecutor<PackageOptions>;
|
|
38
|
+
/**
|
|
39
|
+
* Validates, packages, and publishes an Nx chart to an OCI registry.
|
|
40
|
+
* @param options - Release publication options.
|
|
41
|
+
* @param context - Nx executor context.
|
|
42
|
+
* @returns Whether release publication completed successfully.
|
|
43
|
+
*/
|
|
20
44
|
export declare const releasePublishExecutor: PromiseExecutor<ReleasePublishOptions>;
|
|
21
45
|
export {};
|
|
@@ -2,6 +2,12 @@ import { spawnSync } from 'node:child_process';
|
|
|
2
2
|
import { existsSync, mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync, } from 'node:fs';
|
|
3
3
|
import { tmpdir } from 'node:os';
|
|
4
4
|
import { dirname, join, resolve } from 'node:path';
|
|
5
|
+
/**
|
|
6
|
+
* Runs `helm lint` for an Nx chart project.
|
|
7
|
+
* @param options - Helm lint options.
|
|
8
|
+
* @param context - Nx executor context.
|
|
9
|
+
* @returns Whether Helm lint completed successfully.
|
|
10
|
+
*/
|
|
5
11
|
export const lintExecutor = async (options, context) => {
|
|
6
12
|
try {
|
|
7
13
|
const root = chartRoot(context);
|
|
@@ -19,6 +25,12 @@ export const lintExecutor = async (options, context) => {
|
|
|
19
25
|
return { success: false };
|
|
20
26
|
}
|
|
21
27
|
};
|
|
28
|
+
/**
|
|
29
|
+
* Renders an Nx chart with `helm template`.
|
|
30
|
+
* @param options - Helm template options.
|
|
31
|
+
* @param context - Nx executor context.
|
|
32
|
+
* @returns Whether template rendering completed successfully.
|
|
33
|
+
*/
|
|
22
34
|
export const templateExecutor = async (options, context) => {
|
|
23
35
|
try {
|
|
24
36
|
const root = chartRoot(context);
|
|
@@ -40,6 +52,12 @@ export const templateExecutor = async (options, context) => {
|
|
|
40
52
|
return { success: false };
|
|
41
53
|
}
|
|
42
54
|
};
|
|
55
|
+
/**
|
|
56
|
+
* Packages an Nx chart with `helm package`.
|
|
57
|
+
* @param options - Helm package options.
|
|
58
|
+
* @param context - Nx executor context.
|
|
59
|
+
* @returns Whether chart packaging completed successfully.
|
|
60
|
+
*/
|
|
43
61
|
export const packageExecutor = async (options, context) => {
|
|
44
62
|
try {
|
|
45
63
|
const root = chartRoot(context);
|
|
@@ -54,10 +72,17 @@ export const packageExecutor = async (options, context) => {
|
|
|
54
72
|
return { success: false };
|
|
55
73
|
}
|
|
56
74
|
};
|
|
75
|
+
/**
|
|
76
|
+
* Validates, packages, and publishes an Nx chart to an OCI registry.
|
|
77
|
+
* @param options - Release publication options.
|
|
78
|
+
* @param context - Nx executor context.
|
|
79
|
+
* @returns Whether release publication completed successfully.
|
|
80
|
+
*/
|
|
57
81
|
export const releasePublishExecutor = async (options, context) => {
|
|
58
82
|
try {
|
|
59
|
-
if (!options.registry.startsWith('oci://'))
|
|
83
|
+
if (!options.registry.startsWith('oci://')) {
|
|
60
84
|
throw new Error('[nx-helm] registry must be an OCI repository.');
|
|
85
|
+
}
|
|
61
86
|
const root = chartRoot(context);
|
|
62
87
|
buildDependencies(root, true);
|
|
63
88
|
helm(['lint', '.'], root);
|
|
@@ -67,8 +92,9 @@ export const releasePublishExecutor = async (options, context) => {
|
|
|
67
92
|
// Helm, not this executor, reads Chart.yaml and chooses the versioned archive.
|
|
68
93
|
helm(['package', '.', '--destination', output], root);
|
|
69
94
|
const archives = readdirSync(output).filter((file) => file.endsWith('.tgz'));
|
|
70
|
-
if (archives.length !== 1)
|
|
95
|
+
if (archives.length !== 1) {
|
|
71
96
|
throw new Error('[nx-helm] Helm must create exactly one chart archive for publication.');
|
|
97
|
+
}
|
|
72
98
|
helm(['push', join(output, archives[0]), options.registry], root);
|
|
73
99
|
}
|
|
74
100
|
finally {
|
|
@@ -84,8 +110,9 @@ export const releasePublishExecutor = async (options, context) => {
|
|
|
84
110
|
function chartRoot(context) {
|
|
85
111
|
const project = context.projectName &&
|
|
86
112
|
context.projectsConfigurations?.projects[context.projectName];
|
|
87
|
-
if (!project)
|
|
113
|
+
if (!project) {
|
|
88
114
|
throw new Error('[nx-helm] The executor requires an Nx project context.');
|
|
115
|
+
}
|
|
89
116
|
return resolve(context.root, project.root);
|
|
90
117
|
}
|
|
91
118
|
function interpolate(value, context) {
|
|
@@ -99,14 +126,16 @@ function helm(args, cwd) {
|
|
|
99
126
|
cwd,
|
|
100
127
|
encoding: 'utf8',
|
|
101
128
|
});
|
|
102
|
-
if (result.status !== 0)
|
|
129
|
+
if (result.status !== 0) {
|
|
103
130
|
throw new Error(`[nx-helm] helm ${args[0]} failed: ${(result.stderr || result.stdout).trim()}`);
|
|
131
|
+
}
|
|
104
132
|
return result.stdout;
|
|
105
133
|
}
|
|
106
134
|
function buildDependencies(root, requireLock = false) {
|
|
107
135
|
if (!existsSync(join(root, 'Chart.lock'))) {
|
|
108
|
-
if (requireLock)
|
|
136
|
+
if (requireLock) {
|
|
109
137
|
throw new Error(`[nx-helm] ${join(root, 'Chart.lock')} is required for release publication.`);
|
|
138
|
+
}
|
|
110
139
|
return;
|
|
111
140
|
}
|
|
112
141
|
helm(['dependency', 'build', '--skip-refresh', '.'], root);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/executors/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,UAAU,EACV,SAAS,EACT,WAAW,EACX,WAAW,EACX,MAAM,EACN,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqBnD,MAAM,CAAC,MAAM,YAAY,GAAiC,KAAK,EAC7D,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAChC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,CACF;YACE,MAAM;YACN,GAAG;YACH,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,GAAG,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC;SACvC,EACD,IAAI,CACL,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC9D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAqC,KAAK,EACrE,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAChC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,OAAO,CACpB,OAAO,CAAC,IAAI,EACZ,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CACzC,CAAC;QACF,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,aAAa,CACX,MAAM,EACN,IAAI,CACF;YACE,UAAU;YACV,OAAO,CAAC,WAAW;gBACjB,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC;gBAC3C,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC;YACpC,GAAG;YACH,GAAG,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC;SACvC,EACD,IAAI,CACL,CACF,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC9D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAoC,KAAK,EACnE,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAChC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,OAAO,CACpB,OAAO,CAAC,IAAI,EACZ,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CACzC,CAAC;QACF,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QACtD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC9D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAE/B,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC7B,IAAI,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/executors/commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,22 @@
|
|
|
1
1
|
import { type Tree } from '@nx/devkit';
|
|
2
|
+
/** Options used to generate a standalone Helm chart project. */
|
|
2
3
|
export interface ChartGeneratorOptions {
|
|
4
|
+
/** Lower-case DNS label used as the chart name. */
|
|
3
5
|
name: string;
|
|
6
|
+
/** Directory under which the chart is generated. */
|
|
4
7
|
directory?: string;
|
|
8
|
+
/** Optional Nx project name; defaults to the chart name. */
|
|
5
9
|
projectName?: string;
|
|
10
|
+
/** Optional OCI registry stored in project metadata. */
|
|
6
11
|
registry?: string;
|
|
12
|
+
/** Optional Nx tags; defaults to the chart artifact tags. */
|
|
7
13
|
tags?: string[];
|
|
8
14
|
}
|
|
15
|
+
/**
|
|
16
|
+
* Generates a standalone Helm chart and registers its Nx Release group.
|
|
17
|
+
* @param tree - Virtual Nx workspace tree to update.
|
|
18
|
+
* @param options - Chart generator options.
|
|
19
|
+
* @returns A promise completed after the chart is generated.
|
|
20
|
+
* @throws If the chart or project would overwrite existing workspace content.
|
|
21
|
+
*/
|
|
9
22
|
export default function chartGenerator(tree: Tree, options: ChartGeneratorOptions): Promise<void>;
|
package/src/generators/chart.js
CHANGED
|
@@ -4,19 +4,31 @@ import { mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync, } from '
|
|
|
4
4
|
import { join } from 'node:path';
|
|
5
5
|
import { tmpdir } from 'node:os';
|
|
6
6
|
const chartName = /^[a-z0-9](?:[-a-z0-9]*[a-z0-9])?$/;
|
|
7
|
+
/**
|
|
8
|
+
* Generates a standalone Helm chart and registers its Nx Release group.
|
|
9
|
+
* @param tree - Virtual Nx workspace tree to update.
|
|
10
|
+
* @param options - Chart generator options.
|
|
11
|
+
* @returns A promise completed after the chart is generated.
|
|
12
|
+
* @throws If the chart or project would overwrite existing workspace content.
|
|
13
|
+
*/
|
|
7
14
|
export default async function chartGenerator(tree, options) {
|
|
8
|
-
if (!chartName.test(options.name) || options.name.length > 63)
|
|
15
|
+
if (!chartName.test(options.name) || options.name.length > 63) {
|
|
9
16
|
throw new Error('[nx-helm] Chart names must be lower-case DNS labels of at most 63 characters.');
|
|
17
|
+
}
|
|
10
18
|
const root = joinPathFragments(options.directory ?? 'charts', options.name);
|
|
11
19
|
const projectName = options.projectName ?? options.name;
|
|
12
20
|
const releaseGroup = `helm-${projectName}`;
|
|
13
|
-
if (tree.exists(root) ||
|
|
21
|
+
if (tree.exists(root) ||
|
|
22
|
+
tree.exists(joinPathFragments(root, 'project.json'))) {
|
|
14
23
|
throw new Error(`[nx-helm] Refusing to overwrite ${root}.`);
|
|
15
|
-
|
|
24
|
+
}
|
|
25
|
+
if (getProjects(tree).has(projectName)) {
|
|
16
26
|
throw new Error(`[nx-helm] Refusing to overwrite existing Nx project ${projectName}.`);
|
|
27
|
+
}
|
|
17
28
|
const nxJson = readNxJson(tree) ?? {};
|
|
18
|
-
if (nxJson.release?.groups?.[releaseGroup])
|
|
29
|
+
if (nxJson.release?.groups?.[releaseGroup]) {
|
|
19
30
|
throw new Error(`[nx-helm] Refusing to overwrite existing Nx Release group ${releaseGroup}.`);
|
|
31
|
+
}
|
|
20
32
|
const temporary = mkdtempSync(join(tmpdir(), 'otwld-helm-'));
|
|
21
33
|
try {
|
|
22
34
|
const generated = join(temporary, options.name);
|
|
@@ -64,7 +76,10 @@ export default async function chartGenerator(tree, options) {
|
|
|
64
76
|
},
|
|
65
77
|
});
|
|
66
78
|
}
|
|
67
|
-
/**
|
|
79
|
+
/**
|
|
80
|
+
* Runs Helm's dependency workflow to create the committed Chart.lock.
|
|
81
|
+
* @param chartDirectory - Temporary chart directory on which Helm operates.
|
|
82
|
+
*/
|
|
68
83
|
function prepareDependencyLock(chartDirectory) {
|
|
69
84
|
const chartPath = join(chartDirectory, 'Chart.yaml');
|
|
70
85
|
const chart = readFileSync(chartPath, 'utf8');
|
|
@@ -72,17 +87,20 @@ function prepareDependencyLock(chartDirectory) {
|
|
|
72
87
|
helm(['dependency', 'update', '--skip-refresh', '.'], chartDirectory);
|
|
73
88
|
const ignorePath = join(chartDirectory, '.helmignore');
|
|
74
89
|
const ignore = readFileSync(ignorePath, 'utf8');
|
|
75
|
-
if (!ignore.split(/\r?\n/).includes('charts/'))
|
|
90
|
+
if (!ignore.split(/\r?\n/).includes('charts/')) {
|
|
76
91
|
writeFileSync(ignorePath, `${ignore.trimEnd()}\ncharts/\n`);
|
|
92
|
+
}
|
|
77
93
|
}
|
|
78
94
|
function copyDirectory(tree, source, destination) {
|
|
79
95
|
for (const entry of readdirSync(source, { withFileTypes: true })) {
|
|
80
96
|
const from = join(source, entry.name);
|
|
81
97
|
const to = joinPathFragments(destination, entry.name);
|
|
82
|
-
if (entry.isDirectory())
|
|
98
|
+
if (entry.isDirectory()) {
|
|
83
99
|
copyDirectory(tree, from, to);
|
|
84
|
-
|
|
100
|
+
}
|
|
101
|
+
else if (entry.isFile()) {
|
|
85
102
|
tree.write(to, readFileSync(from));
|
|
103
|
+
}
|
|
86
104
|
}
|
|
87
105
|
}
|
|
88
106
|
function helm(args, cwd) {
|
|
@@ -90,8 +108,9 @@ function helm(args, cwd) {
|
|
|
90
108
|
cwd,
|
|
91
109
|
encoding: 'utf8',
|
|
92
110
|
});
|
|
93
|
-
if (result.status !== 0)
|
|
111
|
+
if (result.status !== 0) {
|
|
94
112
|
throw new Error(`[nx-helm] helm ${args[0]} failed: ${(result.stderr || result.stdout).trim()}`);
|
|
113
|
+
}
|
|
95
114
|
return result.stdout;
|
|
96
115
|
}
|
|
97
116
|
//# sourceMappingURL=chart.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chart.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/generators/chart.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,WAAW,EACX,iBAAiB,EACjB,UAAU,EACV,YAAY,GAEb,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,WAAW,EACX,WAAW,EACX,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"chart.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/generators/chart.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,WAAW,EACX,iBAAiB,EACjB,UAAU,EACV,YAAY,GAEb,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,WAAW,EACX,WAAW,EACX,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAgBjC,MAAM,SAAS,GAAG,mCAAmC,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,OAA8B;IAE9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,SAAS,IAAI,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IACxD,MAAM,YAAY,GAAG,QAAQ,WAAW,EAAE,CAAC;IAC3C,IACE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EACpD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CACb,uDAAuD,WAAW,GAAG,CACtE,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACtC,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACb,6DAA6D,YAAY,GAAG,CAC7E,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;IAC7D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;QACvC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACjC,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE;QACzC,IAAI;QACJ,WAAW,EAAE,aAAa;QAC1B,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI;YACpB,YAAY;YACZ,SAAS,OAAO,CAAC,IAAI,EAAE;YACvB,oBAAoB;SACrB;QACD,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;KAC3E,CAAC,CAAC;IACH,YAAY,CAAC,IAAI,EAAE;QACjB,GAAG,MAAM;QACT,OAAO,EAAE;YACP,GAAG,MAAM,CAAC,OAAO;YACjB,MAAM,EAAE;gBACN,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM;gBACzB,CAAC,YAAY,CAAC,EAAE;oBACd,QAAQ,EAAE,CAAC,WAAW,CAAC;oBACvB,oBAAoB,EAAE,aAAa;oBACnC,UAAU,EAAE;wBACV,OAAO,EAAE,8BAA8B;wBACvC,aAAa,EAAE,IAAI;qBACpB;oBACD,OAAO,EAAE;wBACP,cAAc,EAAE,wBAAwB;wBACxC,qBAAqB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE;wBAC3D,sBAAsB,EAAE,SAAS;wBACjC,8BAA8B,EAAE,MAAM;wBACtC,eAAe,EAAE,sBAAsB;wBACvC,gBAAgB,EAAE,OAAO;qBAC1B;oBACD,SAAS,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE;iBACpC;aACF;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,SAAS,qBAAqB,CAAC,cAAsB;IACnD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACrD,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC9C,aAAa,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;IACnE,IAAI,CAAC,CAAC,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/C,aAAa,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,IAAU,EAAE,MAAc,EAAE,WAAmB;IACpE,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,EAAE,GAAG,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,IAAI,CAAC,IAAc,EAAE,GAAW;IACvC,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE;QAC1D,GAAG;QACH,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/E,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC"}
|
package/src/plugin.d.ts
CHANGED
|
@@ -1,13 +1,25 @@
|
|
|
1
1
|
import type { CreateDependencies, CreateNodes } from '@nx/devkit';
|
|
2
|
+
/** Options used to infer and configure Nx Helm chart projects. */
|
|
2
3
|
export interface HelmPluginOptions {
|
|
4
|
+
/** Optional OCI registry override used by release publication. */
|
|
3
5
|
publish?: {
|
|
4
6
|
registry?: string;
|
|
5
7
|
};
|
|
6
8
|
}
|
|
9
|
+
/**
|
|
10
|
+
* Infers Nx chart projects from Helm Chart.yaml files.
|
|
11
|
+
* @param files - Matching Chart.yaml files.
|
|
12
|
+
* @param options - Plugin options supplied by Nx.
|
|
13
|
+
* @param context - Nx workspace inference context.
|
|
14
|
+
* @returns Inferred Nx project configurations.
|
|
15
|
+
*/
|
|
7
16
|
export declare const createNodes: CreateNodes<HelmPluginOptions>;
|
|
8
17
|
/**
|
|
9
|
-
*
|
|
18
|
+
* Infers only direct, local Helm chart dependencies. A chart dependency has no
|
|
10
19
|
* relationship to an application or image project merely because that project
|
|
11
20
|
* happens to be nearby in the workspace.
|
|
21
|
+
* @param _options - Plugin options supplied by Nx.
|
|
22
|
+
* @param context - Nx project graph inference context.
|
|
23
|
+
* @returns Inferred local chart dependencies.
|
|
12
24
|
*/
|
|
13
25
|
export declare const createDependencies: CreateDependencies<HelmPluginOptions>;
|
package/src/plugin.js
CHANGED
|
@@ -5,14 +5,24 @@ import { parseDocument } from 'yaml';
|
|
|
5
5
|
const helmRuntime = { runtime: "helm version --template '{{.Version}}'" };
|
|
6
6
|
const semverCore = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
|
|
7
7
|
const semverIdentifiers = /^[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*$/;
|
|
8
|
+
/**
|
|
9
|
+
* Infers Nx chart projects from Helm Chart.yaml files.
|
|
10
|
+
* @param files - Matching Chart.yaml files.
|
|
11
|
+
* @param options - Plugin options supplied by Nx.
|
|
12
|
+
* @param context - Nx workspace inference context.
|
|
13
|
+
* @returns Inferred Nx project configurations.
|
|
14
|
+
*/
|
|
8
15
|
export const createNodes = [
|
|
9
16
|
'**/Chart.yaml',
|
|
10
17
|
async (files, options, context) => createNodesFromFiles((file, pluginOptions, callbackContext) => createChartNodes(file, pluginOptions, callbackContext), files, options, context),
|
|
11
18
|
];
|
|
12
19
|
/**
|
|
13
|
-
*
|
|
20
|
+
* Infers only direct, local Helm chart dependencies. A chart dependency has no
|
|
14
21
|
* relationship to an application or image project merely because that project
|
|
15
22
|
* happens to be nearby in the workspace.
|
|
23
|
+
* @param _options - Plugin options supplied by Nx.
|
|
24
|
+
* @param context - Nx project graph inference context.
|
|
25
|
+
* @returns Inferred local chart dependencies.
|
|
16
26
|
*/
|
|
17
27
|
export const createDependencies = (_options, context) => {
|
|
18
28
|
const chartProjectsByRoot = new Map(Object.entries(context.projects)
|
|
@@ -23,18 +33,20 @@ export const createDependencies = (_options, context) => {
|
|
|
23
33
|
]));
|
|
24
34
|
const dependencies = [];
|
|
25
35
|
for (const [source, project] of Object.entries(context.projects)) {
|
|
26
|
-
if (!isChartProject(project, context.workspaceRoot))
|
|
36
|
+
if (!isChartProject(project, context.workspaceRoot)) {
|
|
27
37
|
continue;
|
|
38
|
+
}
|
|
28
39
|
const chartPath = join(context.workspaceRoot, project.root, 'Chart.yaml');
|
|
29
40
|
for (const dependencyRoot of localDependencyRoots(chartPath)) {
|
|
30
41
|
const target = chartProjectsByRoot.get(dependencyRoot);
|
|
31
|
-
if (target && target !== source)
|
|
42
|
+
if (target && target !== source) {
|
|
32
43
|
dependencies.push({
|
|
33
44
|
source,
|
|
34
45
|
target,
|
|
35
46
|
sourceFile: join(project.root, 'Chart.yaml').replaceAll('\\', '/'),
|
|
36
47
|
type: DependencyType.static,
|
|
37
48
|
});
|
|
49
|
+
}
|
|
38
50
|
}
|
|
39
51
|
}
|
|
40
52
|
return dependencies;
|
|
@@ -45,15 +57,18 @@ function isChartProject(project, workspaceRoot) {
|
|
|
45
57
|
}
|
|
46
58
|
function localDependencyRoots(chartPath) {
|
|
47
59
|
const document = parseDocument(readFileSync(chartPath, 'utf8'));
|
|
48
|
-
if (document.errors.length)
|
|
60
|
+
if (document.errors.length) {
|
|
49
61
|
throw new Error(`[nx-helm] Invalid ${chartPath}: ${document.errors[0].message}`);
|
|
62
|
+
}
|
|
50
63
|
const dependencies = document.toJS()?.dependencies;
|
|
51
|
-
if (!Array.isArray(dependencies))
|
|
64
|
+
if (!Array.isArray(dependencies)) {
|
|
52
65
|
return [];
|
|
66
|
+
}
|
|
53
67
|
return dependencies.flatMap((dependency) => {
|
|
54
68
|
const repository = dependency?.repository;
|
|
55
|
-
if (typeof repository !== 'string' || !repository.startsWith('file://'))
|
|
69
|
+
if (typeof repository !== 'string' || !repository.startsWith('file://')) {
|
|
56
70
|
return [];
|
|
71
|
+
}
|
|
57
72
|
return [resolve(dirname(chartPath), repository.slice('file://'.length))];
|
|
58
73
|
});
|
|
59
74
|
}
|
|
@@ -62,8 +77,9 @@ function createChartNodes(file, options, context) {
|
|
|
62
77
|
const root = relative(context.workspaceRoot, absoluteRoot).replaceAll('\\', '/');
|
|
63
78
|
if (!root ||
|
|
64
79
|
root.startsWith('..') ||
|
|
65
|
-
!existsSync(join(absoluteRoot, 'project.json')))
|
|
80
|
+
!existsSync(join(absoluteRoot, 'project.json'))) {
|
|
66
81
|
return {};
|
|
82
|
+
}
|
|
67
83
|
const version = readChartVersion(join(absoluteRoot, 'Chart.yaml'));
|
|
68
84
|
const project = readProjectFile(absoluteRoot);
|
|
69
85
|
const projectRegistry = readRegistry(project.metadata?.helm?.registry);
|
|
@@ -92,12 +108,13 @@ function createChartNodes(file, options, context) {
|
|
|
92
108
|
// A chart owns its OCI repository in project metadata. A workspace plugin
|
|
93
109
|
// option is deliberately only an explicit cross-chart override.
|
|
94
110
|
const registry = readRegistry(options?.publish?.registry) ?? projectRegistry;
|
|
95
|
-
if (registry)
|
|
111
|
+
if (registry) {
|
|
96
112
|
targets['nx-release-publish'] = {
|
|
97
113
|
executor: '@otwld/nx-helm:release-publish',
|
|
98
114
|
cache: false,
|
|
99
115
|
options: { registry },
|
|
100
116
|
};
|
|
117
|
+
}
|
|
101
118
|
return {
|
|
102
119
|
projects: {
|
|
103
120
|
[root]: {
|
|
@@ -122,19 +139,22 @@ function readProjectFile(root) {
|
|
|
122
139
|
}
|
|
123
140
|
function readChartVersion(chartPath) {
|
|
124
141
|
const document = parseDocument(readFileSync(chartPath, 'utf8'));
|
|
125
|
-
if (document.errors.length)
|
|
142
|
+
if (document.errors.length) {
|
|
126
143
|
throw new Error(`[nx-helm] Invalid ${chartPath}: ${document.errors[0].message}`);
|
|
144
|
+
}
|
|
127
145
|
const version = document.toJS()?.version;
|
|
128
|
-
if (typeof version !== 'string' || !isSemverLikeVersion(version))
|
|
146
|
+
if (typeof version !== 'string' || !isSemverLikeVersion(version)) {
|
|
129
147
|
throw new Error(`[nx-helm] ${chartPath} requires a semantic-version string version.`);
|
|
148
|
+
}
|
|
130
149
|
return version;
|
|
131
150
|
}
|
|
132
151
|
function isSemverLikeVersion(version) {
|
|
133
152
|
const [withoutBuild, ...build] = version.split('+');
|
|
134
153
|
if (!withoutBuild ||
|
|
135
154
|
build.length > 1 ||
|
|
136
|
-
(build.length === 1 && !semverIdentifiers.test(build[0])))
|
|
155
|
+
(build.length === 1 && !semverIdentifiers.test(build[0]))) {
|
|
137
156
|
return false;
|
|
157
|
+
}
|
|
138
158
|
const prereleaseIndex = withoutBuild.indexOf('-');
|
|
139
159
|
const core = prereleaseIndex === -1
|
|
140
160
|
? withoutBuild
|
package/src/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,51 @@
|
|
|
1
1
|
import { VersionActions } from 'nx/release';
|
|
2
|
-
import type { ProjectGraph } from '@nx/devkit';
|
|
3
|
-
import type { Tree } from '@nx/devkit';
|
|
2
|
+
import type { ProjectGraph, Tree } from '@nx/devkit';
|
|
4
3
|
/** Nx Release version-phase actions for standalone Helm charts. */
|
|
5
4
|
export default class HelmVersionActions extends VersionActions {
|
|
5
|
+
/** Manifest filename used as the Helm chart version source. */
|
|
6
6
|
validManifestFilenames: string[];
|
|
7
|
+
/**
|
|
8
|
+
* Reads the current chart version from Chart.yaml.
|
|
9
|
+
* @param tree - Virtual workspace tree containing the chart.
|
|
10
|
+
* @returns The chart version and manifest path.
|
|
11
|
+
* @throws If Chart.yaml is missing or has no string version.
|
|
12
|
+
*/
|
|
7
13
|
readCurrentVersionFromSourceManifest(tree: Tree): Promise<{
|
|
8
14
|
currentVersion: string;
|
|
9
15
|
manifestPath: string;
|
|
10
16
|
}>;
|
|
17
|
+
/**
|
|
18
|
+
* Reads the current chart version from the OCI registry.
|
|
19
|
+
* @returns No registry lookup result; chart versions come from source.
|
|
20
|
+
*/
|
|
11
21
|
readCurrentVersionFromRegistry(): Promise<{
|
|
12
22
|
currentVersion: string | null;
|
|
13
23
|
logText: string;
|
|
14
24
|
} | null>;
|
|
25
|
+
/**
|
|
26
|
+
* Reads the current version of a local chart dependency.
|
|
27
|
+
* @param tree - Virtual workspace tree containing the charts.
|
|
28
|
+
* @param projectGraph - Nx project graph used to identify chart projects.
|
|
29
|
+
* @param dependencyProjectName - Nx project name of the dependency.
|
|
30
|
+
* @returns The dependency version and collection to update.
|
|
31
|
+
*/
|
|
15
32
|
readCurrentVersionOfDependency(tree: Tree, projectGraph: ProjectGraph, dependencyProjectName: string): Promise<{
|
|
16
33
|
currentVersion: string | null;
|
|
17
34
|
dependencyCollection: string | null;
|
|
18
35
|
}>;
|
|
36
|
+
/**
|
|
37
|
+
* Updates the chart version in every manifest selected by Nx Release.
|
|
38
|
+
* @param tree - Virtual workspace tree to update.
|
|
39
|
+
* @param newVersion - Version to write to Chart.yaml.
|
|
40
|
+
* @returns Messages describing modified manifests.
|
|
41
|
+
*/
|
|
19
42
|
updateProjectVersion(tree: Tree, newVersion: string): Promise<string[]>;
|
|
43
|
+
/**
|
|
44
|
+
* Updates local chart dependency versions and regenerates Chart.lock.
|
|
45
|
+
* @param tree - Virtual workspace tree to update.
|
|
46
|
+
* @param projectGraph - Nx project graph used to resolve local charts.
|
|
47
|
+
* @param dependenciesToUpdate - New versions keyed by project name.
|
|
48
|
+
* @returns Messages describing modified dependency manifests.
|
|
49
|
+
*/
|
|
20
50
|
updateProjectDependencies(tree: Tree, projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
|
|
21
51
|
}
|
|
@@ -6,26 +6,52 @@ import { dirname, join, relative, resolve } from 'node:path';
|
|
|
6
6
|
import { isMap, isSeq, parseDocument } from 'yaml';
|
|
7
7
|
/** Nx Release version-phase actions for standalone Helm charts. */
|
|
8
8
|
export default class HelmVersionActions extends VersionActions {
|
|
9
|
+
/** Manifest filename used as the Helm chart version source. */
|
|
9
10
|
validManifestFilenames = ['Chart.yaml'];
|
|
11
|
+
/**
|
|
12
|
+
* Reads the current chart version from Chart.yaml.
|
|
13
|
+
* @param tree - Virtual workspace tree containing the chart.
|
|
14
|
+
* @returns The chart version and manifest path.
|
|
15
|
+
* @throws If Chart.yaml is missing or has no string version.
|
|
16
|
+
*/
|
|
10
17
|
async readCurrentVersionFromSourceManifest(tree) {
|
|
11
18
|
const manifestPath = join(this.projectGraphNode.data.root, 'Chart.yaml');
|
|
12
19
|
const chart = readChart(tree, manifestPath);
|
|
13
|
-
if (typeof chart.get('version') !== 'string')
|
|
20
|
+
if (typeof chart.get('version') !== 'string') {
|
|
14
21
|
throw new Error(`[nx-helm] ${manifestPath} requires a string version.`);
|
|
22
|
+
}
|
|
15
23
|
return { currentVersion: chart.get('version'), manifestPath };
|
|
16
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* Reads the current chart version from the OCI registry.
|
|
27
|
+
* @returns No registry lookup result; chart versions come from source.
|
|
28
|
+
*/
|
|
17
29
|
async readCurrentVersionFromRegistry() {
|
|
18
30
|
return null;
|
|
19
31
|
}
|
|
32
|
+
/**
|
|
33
|
+
* Reads the current version of a local chart dependency.
|
|
34
|
+
* @param tree - Virtual workspace tree containing the charts.
|
|
35
|
+
* @param projectGraph - Nx project graph used to identify chart projects.
|
|
36
|
+
* @param dependencyProjectName - Nx project name of the dependency.
|
|
37
|
+
* @returns The dependency version and collection to update.
|
|
38
|
+
*/
|
|
20
39
|
async readCurrentVersionOfDependency(tree, projectGraph, dependencyProjectName) {
|
|
21
40
|
const dependency = findLocalChartDependency(tree, this.projectGraphNode.data.root, projectGraph, dependencyProjectName);
|
|
22
|
-
if (dependency && typeof dependency.version === 'string')
|
|
41
|
+
if (dependency && typeof dependency.version === 'string') {
|
|
23
42
|
return {
|
|
24
43
|
currentVersion: dependency.version,
|
|
25
44
|
dependencyCollection: 'dependencies',
|
|
26
45
|
};
|
|
46
|
+
}
|
|
27
47
|
return { currentVersion: null, dependencyCollection: null };
|
|
28
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* Updates the chart version in every manifest selected by Nx Release.
|
|
51
|
+
* @param tree - Virtual workspace tree to update.
|
|
52
|
+
* @param newVersion - Version to write to Chart.yaml.
|
|
53
|
+
* @returns Messages describing modified manifests.
|
|
54
|
+
*/
|
|
29
55
|
async updateProjectVersion(tree, newVersion) {
|
|
30
56
|
const messages = [];
|
|
31
57
|
for (const manifest of this.manifestsToUpdate) {
|
|
@@ -36,34 +62,28 @@ export default class HelmVersionActions extends VersionActions {
|
|
|
36
62
|
}
|
|
37
63
|
return messages;
|
|
38
64
|
}
|
|
65
|
+
/**
|
|
66
|
+
* Updates local chart dependency versions and regenerates Chart.lock.
|
|
67
|
+
* @param tree - Virtual workspace tree to update.
|
|
68
|
+
* @param projectGraph - Nx project graph used to resolve local charts.
|
|
69
|
+
* @param dependenciesToUpdate - New versions keyed by project name.
|
|
70
|
+
* @returns Messages describing modified dependency manifests.
|
|
71
|
+
*/
|
|
39
72
|
async updateProjectDependencies(tree, projectGraph, dependenciesToUpdate) {
|
|
40
73
|
const chartRoot = this.projectGraphNode.data.root;
|
|
41
74
|
const chartPath = join(chartRoot, 'Chart.yaml');
|
|
42
75
|
const chart = readChart(tree, chartPath);
|
|
43
76
|
const dependencies = chart.get('dependencies', true);
|
|
44
|
-
if (!isSeq(dependencies))
|
|
77
|
+
if (!isSeq(dependencies)) {
|
|
45
78
|
return [];
|
|
79
|
+
}
|
|
46
80
|
const chartProjectByRoot = new Map(Object.values(projectGraph.nodes)
|
|
47
81
|
.filter((node) => isChartProject(node.data, tree))
|
|
48
82
|
.map((node) => [normalizePath(node.data.root), node.name]));
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
if (!isMap(dependency))
|
|
52
|
-
continue;
|
|
53
|
-
const repository = dependency.get('repository');
|
|
54
|
-
if (typeof repository !== 'string' || !repository.startsWith('file://'))
|
|
55
|
-
continue;
|
|
56
|
-
const target = chartProjectByRoot.get(resolveLocalRepository(chartRoot, repository));
|
|
57
|
-
const sourceVersion = localChartVersion(tree, resolveLocalRepository(chartRoot, repository));
|
|
58
|
-
const requestedVersion = target && dependenciesToUpdate[target];
|
|
59
|
-
const newVersion = resolveDependencyVersion(dependency.get('version'), requestedVersion, sourceVersion);
|
|
60
|
-
if (newVersion && dependency.get('version') !== newVersion) {
|
|
61
|
-
dependency.set('version', newVersion);
|
|
62
|
-
changed = true;
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
if (!changed)
|
|
83
|
+
const changed = dependencies.items.some((dependency) => updateLocalDependency(dependency, tree, chartRoot, chartProjectByRoot, dependenciesToUpdate));
|
|
84
|
+
if (!changed) {
|
|
66
85
|
return [];
|
|
86
|
+
}
|
|
67
87
|
tree.write(chartPath, chart.toString());
|
|
68
88
|
regenerateLock(tree, chartRoot, projectGraph);
|
|
69
89
|
return [
|
|
@@ -71,22 +91,45 @@ export default class HelmVersionActions extends VersionActions {
|
|
|
71
91
|
];
|
|
72
92
|
}
|
|
73
93
|
}
|
|
94
|
+
function updateLocalDependency(dependency, tree, chartRoot, chartProjectByRoot, dependenciesToUpdate) {
|
|
95
|
+
if (!isMap(dependency)) {
|
|
96
|
+
return false;
|
|
97
|
+
}
|
|
98
|
+
const repository = dependency.get('repository');
|
|
99
|
+
if (typeof repository !== 'string' || !repository.startsWith('file://')) {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
const localRepository = resolveLocalRepository(chartRoot, repository);
|
|
103
|
+
const target = chartProjectByRoot.get(localRepository);
|
|
104
|
+
const sourceVersion = localChartVersion(tree, localRepository);
|
|
105
|
+
const requestedVersion = target && dependenciesToUpdate[target];
|
|
106
|
+
const newVersion = resolveDependencyVersion(dependency.get('version'), requestedVersion, sourceVersion);
|
|
107
|
+
if (!newVersion || dependency.get('version') === newVersion) {
|
|
108
|
+
return false;
|
|
109
|
+
}
|
|
110
|
+
dependency.set('version', newVersion);
|
|
111
|
+
return true;
|
|
112
|
+
}
|
|
74
113
|
function readChart(tree, path) {
|
|
75
114
|
const content = tree.read(path, 'utf8');
|
|
76
|
-
if (!content)
|
|
115
|
+
if (!content) {
|
|
77
116
|
throw new Error(`[nx-helm] Missing ${path}.`);
|
|
117
|
+
}
|
|
78
118
|
const chart = parseDocument(content);
|
|
79
|
-
if (chart.errors.length)
|
|
119
|
+
if (chart.errors.length) {
|
|
80
120
|
throw new Error(`[nx-helm] Invalid ${path}: ${chart.errors[0].message}`);
|
|
121
|
+
}
|
|
81
122
|
return chart;
|
|
82
123
|
}
|
|
83
124
|
function findLocalChartDependency(tree, chartRoot, projectGraph, dependencyProjectName) {
|
|
84
125
|
const chart = readChart(tree, join(chartRoot, 'Chart.yaml')).toJS();
|
|
85
|
-
if (!Array.isArray(chart?.dependencies))
|
|
126
|
+
if (!Array.isArray(chart?.dependencies)) {
|
|
86
127
|
return undefined;
|
|
128
|
+
}
|
|
87
129
|
const target = projectGraph.nodes[dependencyProjectName];
|
|
88
|
-
if (!target || !isChartProject(target.data, tree))
|
|
130
|
+
if (!target || !isChartProject(target.data, tree)) {
|
|
89
131
|
return undefined;
|
|
132
|
+
}
|
|
90
133
|
return chart.dependencies.find((dependency) => typeof dependency.repository === 'string' &&
|
|
91
134
|
dependency.repository.startsWith('file://') &&
|
|
92
135
|
resolveLocalRepository(chartRoot, dependency.repository) ===
|
|
@@ -94,8 +137,9 @@ function findLocalChartDependency(tree, chartRoot, projectGraph, dependencyProje
|
|
|
94
137
|
}
|
|
95
138
|
function localChartVersion(tree, chartRoot) {
|
|
96
139
|
const chartPath = join(chartRoot, 'Chart.yaml');
|
|
97
|
-
if (!tree.exists(chartPath))
|
|
140
|
+
if (!tree.exists(chartPath)) {
|
|
98
141
|
return undefined;
|
|
142
|
+
}
|
|
99
143
|
const version = readChart(tree, chartPath).get('version');
|
|
100
144
|
return typeof version === 'string' ? version : undefined;
|
|
101
145
|
}
|
|
@@ -105,12 +149,15 @@ function resolveDependencyVersion(currentVersion, requestedVersion, sourceVersio
|
|
|
105
149
|
// staging version; using that value would make Helm reject the file://
|
|
106
150
|
// dependency. A requested prerelease remains useful when the source chart
|
|
107
151
|
// has not yet been versioned in the current tree.
|
|
108
|
-
if (sourceVersion?.includes('-'))
|
|
152
|
+
if (sourceVersion?.includes('-')) {
|
|
109
153
|
return sourceVersion;
|
|
110
|
-
|
|
154
|
+
}
|
|
155
|
+
if (requestedVersion?.includes('-')) {
|
|
111
156
|
return requestedVersion;
|
|
112
|
-
|
|
157
|
+
}
|
|
158
|
+
if (sourceVersion) {
|
|
113
159
|
return sourceVersion;
|
|
160
|
+
}
|
|
114
161
|
return typeof currentVersion === 'string' ? currentVersion : undefined;
|
|
115
162
|
}
|
|
116
163
|
function regenerateLock(tree, chartRoot, projectGraph) {
|
|
@@ -122,11 +169,13 @@ function regenerateLock(tree, chartRoot, projectGraph) {
|
|
|
122
169
|
cwd: temporaryChartRoot,
|
|
123
170
|
encoding: 'utf8',
|
|
124
171
|
});
|
|
125
|
-
if (result.status !== 0)
|
|
172
|
+
if (result.status !== 0) {
|
|
126
173
|
throw new Error(`[nx-helm] helm dependency update failed: ${(result.stderr || result.stdout).trim()}`);
|
|
174
|
+
}
|
|
127
175
|
const lockPath = join(temporaryChartRoot, 'Chart.lock');
|
|
128
|
-
if (!existsSync(lockPath))
|
|
176
|
+
if (!existsSync(lockPath)) {
|
|
129
177
|
throw new Error('[nx-helm] Helm dependency update did not produce Chart.lock.');
|
|
178
|
+
}
|
|
130
179
|
tree.write(join(chartRoot, 'Chart.lock'), readFileSync(lockPath));
|
|
131
180
|
}
|
|
132
181
|
finally {
|
|
@@ -134,22 +183,26 @@ function regenerateLock(tree, chartRoot, projectGraph) {
|
|
|
134
183
|
}
|
|
135
184
|
}
|
|
136
185
|
function materializeLocalChartTree(tree, chartRoot, projectGraph, temporary, materialized = new Set()) {
|
|
137
|
-
if (materialized.has(chartRoot))
|
|
186
|
+
if (materialized.has(chartRoot)) {
|
|
138
187
|
return;
|
|
188
|
+
}
|
|
139
189
|
materialized.add(chartRoot);
|
|
140
190
|
copyTreeDirectory(tree, chartRoot, temporary);
|
|
141
191
|
const chart = readChart(tree, join(chartRoot, 'Chart.yaml')).toJS();
|
|
142
|
-
for (const targetRoot of localChartDependencyRoots(tree, chartRoot, chart))
|
|
192
|
+
for (const targetRoot of localChartDependencyRoots(tree, chartRoot, chart)) {
|
|
143
193
|
materializeLocalChartTree(tree, targetRoot, projectGraph, temporary, materialized);
|
|
194
|
+
}
|
|
144
195
|
}
|
|
145
196
|
function localChartDependencyRoots(tree, chartRoot, chart) {
|
|
146
197
|
const dependencies = chart.dependencies;
|
|
147
|
-
if (!Array.isArray(dependencies))
|
|
198
|
+
if (!Array.isArray(dependencies)) {
|
|
148
199
|
return [];
|
|
200
|
+
}
|
|
149
201
|
return dependencies.flatMap((dependency) => {
|
|
150
202
|
if (typeof dependency.repository !== 'string' ||
|
|
151
|
-
!dependency.repository.startsWith('file://'))
|
|
203
|
+
!dependency.repository.startsWith('file://')) {
|
|
152
204
|
return [];
|
|
205
|
+
}
|
|
153
206
|
const targetRoot = resolveLocalRepository(chartRoot, dependency.repository);
|
|
154
207
|
return tree.exists(join(targetRoot, 'Chart.yaml')) ? [targetRoot] : [];
|
|
155
208
|
});
|
|
@@ -160,13 +213,15 @@ function copyTreeDirectory(tree, source, destinationRoot) {
|
|
|
160
213
|
const destination = join(destinationRoot, from);
|
|
161
214
|
if (tree.isFile(from)) {
|
|
162
215
|
const contents = tree.read(from);
|
|
163
|
-
if (!contents)
|
|
216
|
+
if (!contents) {
|
|
164
217
|
continue;
|
|
218
|
+
}
|
|
165
219
|
mkdirSync(dirname(destination), { recursive: true });
|
|
166
220
|
writeFileSync(destination, contents);
|
|
167
221
|
}
|
|
168
|
-
else
|
|
222
|
+
else {
|
|
169
223
|
copyTreeDirectory(tree, from, destinationRoot);
|
|
224
|
+
}
|
|
170
225
|
}
|
|
171
226
|
}
|
|
172
227
|
function isChartProject(project, tree) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/release/version-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/release/version-actions.ts"],"names":[],"mappings":"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"}
|