@storm-software/k8s-tools 0.33.19 → 0.33.21
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 +42 -0
- package/README.md +1 -1
- package/dist/{chunk-MHWJWQK2.js → chunk-2VM3K7KU.js} +4 -4
- package/dist/{chunk-HG35QHKH.mjs → chunk-2VYRYASJ.mjs} +8 -4
- package/dist/{chunk-MWIR7DDO.mjs → chunk-3G3MPJDG.mjs} +2 -2
- package/dist/{chunk-LZ7POGOS.js → chunk-42KELIL6.js} +19 -19
- package/dist/{chunk-PP627BAR.mjs → chunk-45BSPPHW.mjs} +1 -1
- package/dist/{chunk-ZMBCXFGG.mjs → chunk-4TLAGM7Q.mjs} +48 -5
- package/dist/{chunk-SSD6CEMJ.mjs → chunk-B6IW75P2.mjs} +2 -2
- package/dist/{chunk-K6LQ35SQ.mjs → chunk-BCAMOLEH.mjs} +2 -2
- package/dist/{chunk-VDVSD6DM.js → chunk-BUTFONAV.js} +11 -7
- package/dist/{chunk-NUWVDX4E.mjs → chunk-BYAWJGMI.mjs} +2 -2
- package/dist/{chunk-Y5PTY4MD.js → chunk-CHFLC4ZX.js} +2 -2
- package/dist/{chunk-KXVDDTR2.js → chunk-DQNAM3M4.js} +25 -25
- package/dist/{chunk-B4Z57I4X.js → chunk-MYILCJRJ.js} +6 -6
- package/dist/{chunk-VVXBCMCY.mjs → chunk-NTERQW5S.mjs} +2 -2
- package/dist/{chunk-3WCZTKAH.js → chunk-PWR7XTOV.js} +123 -80
- package/dist/{chunk-FB3XFULB.js → chunk-YOQ7INE6.js} +4 -4
- package/dist/executors.js +5 -5
- package/dist/executors.mjs +4 -4
- package/dist/generators.js +6 -6
- package/dist/generators.mjs +5 -5
- package/dist/index.js +9 -9
- package/dist/index.mjs +8 -8
- package/dist/src/executors/container-publish/executor.js +4 -4
- package/dist/src/executors/container-publish/executor.mjs +3 -3
- package/dist/src/executors/helm-package/executor.js +4 -4
- package/dist/src/executors/helm-package/executor.mjs +3 -3
- package/dist/src/generators/helm-chart/generator.js +5 -5
- package/dist/src/generators/helm-chart/generator.mjs +4 -4
- package/dist/src/generators/helm-dependency/generator.js +5 -5
- package/dist/src/generators/helm-dependency/generator.mjs +4 -4
- package/dist/src/plugins/docker/index.js +3 -3
- package/dist/src/plugins/docker/index.mjs +2 -2
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,48 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - K8s Tools
|
|
4
4
|
|
|
5
|
+
## [0.33.20](https://github.com/storm-software/storm-ops/releases/tag/k8s-tools%400.33.20) (2025-06-20)
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
- **k8s-tools:** Update all references to latest `OrganizationConfig` type
|
|
10
|
+
definition
|
|
11
|
+
([88765f826](https://github.com/storm-software/storm-ops/commit/88765f826))
|
|
12
|
+
- **k8s-tools:** Update Nx plugin to handle new `organization` configuration
|
|
13
|
+
type definition
|
|
14
|
+
([fef21972c](https://github.com/storm-software/storm-ops/commit/fef21972c))
|
|
15
|
+
|
|
16
|
+
### Miscellaneous
|
|
17
|
+
|
|
18
|
+
- **monorepo:** Regenerate README markdown files
|
|
19
|
+
([0bdc8a84e](https://github.com/storm-software/storm-ops/commit/0bdc8a84e))
|
|
20
|
+
- **monorepo:** Update workspace packages' links
|
|
21
|
+
([35f3ef346](https://github.com/storm-software/storm-ops/commit/35f3ef346))
|
|
22
|
+
|
|
23
|
+
### Updated Dependencies
|
|
24
|
+
|
|
25
|
+
- Updated workspace-tools to 1.275.21
|
|
26
|
+
- Updated config-tools to 1.174.0
|
|
27
|
+
- Updated config to 1.123.0
|
|
28
|
+
|
|
29
|
+
## [0.33.19](https://github.com/storm-software/storm-ops/releases/tag/k8s-tools%400.33.19) (2025-06-18)
|
|
30
|
+
|
|
31
|
+
### Miscellaneous
|
|
32
|
+
|
|
33
|
+
- **monorepo:** Update workspace package links
|
|
34
|
+
([3c7747ccf](https://github.com/storm-software/storm-ops/commit/3c7747ccf))
|
|
35
|
+
- **monorepo:** Regenerate README markdown files
|
|
36
|
+
([0975b603d](https://github.com/storm-software/storm-ops/commit/0975b603d))
|
|
37
|
+
|
|
38
|
+
### Updated Dependencies
|
|
39
|
+
|
|
40
|
+
- Updated workspace-tools to 1.275.20
|
|
41
|
+
- Updated workspace-tools to 1.275.20
|
|
42
|
+
- Updated config-tools to 1.173.9
|
|
43
|
+
- Updated config-tools to 1.173.9
|
|
44
|
+
- Updated config to 1.122.8
|
|
45
|
+
- Updated config to 1.122.8
|
|
46
|
+
|
|
5
47
|
## [0.33.18](https://github.com/storm-software/storm-ops/releases/tag/k8s-tools%400.33.18) (2025-06-18)
|
|
6
48
|
|
|
7
49
|
### Miscellaneous
|
package/README.md
CHANGED
|
@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
|
|
|
21
21
|
|
|
22
22
|
<h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
|
|
23
23
|
|
|
24
|
-
[](https://prettier.io/) [](http://nx.dev/) [](https://nextjs.org/) [](http://commitizen.github.io/cz-cli/)  [](https://fumadocs.vercel.app/) 
|
|
25
25
|
|
|
26
26
|
<!-- prettier-ignore-start -->
|
|
27
27
|
<!-- markdownlint-disable -->
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunk42KELIL6js = require('./chunk-42KELIL6.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _chunkPWR7XTOVjs = require('./chunk-PWR7XTOV.js');
|
|
7
7
|
|
|
8
8
|
// src/generators/helm-dependency/generator.ts
|
|
9
9
|
|
|
@@ -13,7 +13,7 @@ var _chunk3WCZTKAHjs = require('./chunk-3WCZTKAH.js');
|
|
|
13
13
|
var _devkit = require('@nx/devkit');
|
|
14
14
|
var _jsyaml = require('js-yaml'); var _jsyaml2 = _interopRequireDefault(_jsyaml);
|
|
15
15
|
async function helmDependencyGeneratorFn(tree, options, config) {
|
|
16
|
-
|
|
16
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "\u{1F4DD} Preparing to add Helm Dependency", config);
|
|
17
17
|
const project = _devkit.readProjectConfiguration.call(void 0, tree, options.project);
|
|
18
18
|
if (!_optionalChain([project, 'access', _ => _.targets, 'optionalAccess', _2 => _2["helm-package"]])) {
|
|
19
19
|
throw new Error(
|
|
@@ -39,7 +39,7 @@ async function helmDependencyGeneratorFn(tree, options, config) {
|
|
|
39
39
|
success: true
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
|
-
var generator_default =
|
|
42
|
+
var generator_default = _chunk42KELIL6js.withRunGenerator.call(void 0,
|
|
43
43
|
"Helm Dependency",
|
|
44
44
|
helmDependencyGeneratorFn
|
|
45
45
|
);
|
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
import {
|
|
9
9
|
findWorkspaceRoot,
|
|
10
10
|
getConfig
|
|
11
|
-
} from "./chunk-
|
|
11
|
+
} from "./chunk-4TLAGM7Q.mjs";
|
|
12
12
|
|
|
13
13
|
// src/plugins/docker/_dockerfile.ts
|
|
14
14
|
import {
|
|
@@ -56,8 +56,12 @@ var createNodesV2 = [
|
|
|
56
56
|
const labels = [
|
|
57
57
|
`org.opencontainers.image.ref.name=${project.name}`,
|
|
58
58
|
`org.opencontainers.image.title=${titleCase(project.name)}`,
|
|
59
|
-
`org.opencontainers.image.authors=${config.organization ? titleCase(
|
|
60
|
-
|
|
59
|
+
`org.opencontainers.image.authors=${config.organization ? titleCase(
|
|
60
|
+
typeof config.organization === "string" ? config.organization : config.organization.name
|
|
61
|
+
) : "Storm Software"}`,
|
|
62
|
+
`org.opencontainers.image.vendor=${config.organization ? titleCase(
|
|
63
|
+
typeof config.organization === "string" ? config.organization : config.organization.name
|
|
64
|
+
) : "Storm Software"}`,
|
|
61
65
|
`org.opencontainers.image.documentation=${config.docs}`,
|
|
62
66
|
`org.opencontainers.image.url=${config.homepage}`,
|
|
63
67
|
`org.opencontainers.image.source=${config.repository}`
|
|
@@ -90,7 +94,7 @@ var createNodesV2 = [
|
|
|
90
94
|
metadata: {
|
|
91
95
|
images: [
|
|
92
96
|
`${config.namespace ? config.namespace : "storm-software"}/${project.name?.replace(`${config.namespace}-`, "")}`,
|
|
93
|
-
`ghcr.io/${config.organization ? config.organization : "storm-software"}/${project.name}`
|
|
97
|
+
`ghcr.io/${(typeof config.organization === "string" ? config.organization : config.organization?.name) || "storm-software"}/${project.name}`
|
|
94
98
|
],
|
|
95
99
|
tags: [
|
|
96
100
|
"type=schedule",
|
|
@@ -3,11 +3,11 @@ import {
|
|
|
3
3
|
} from "./chunk-WV3ZYQE2.mjs";
|
|
4
4
|
import {
|
|
5
5
|
applyWorkspaceTokens
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-45BSPPHW.mjs";
|
|
7
7
|
import {
|
|
8
8
|
findWorkspaceRoot,
|
|
9
9
|
getConfig
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-4TLAGM7Q.mjs";
|
|
11
11
|
|
|
12
12
|
// src/executors/container-publish/executor.ts
|
|
13
13
|
import {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
var
|
|
4
|
+
var _chunkCHFLC4ZXjs = require('./chunk-CHFLC4ZX.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
@@ -12,51 +12,51 @@ var _chunkY5PTY4MDjs = require('./chunk-Y5PTY4MD.js');
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
15
|
-
var
|
|
15
|
+
var _chunkPWR7XTOVjs = require('./chunk-PWR7XTOV.js');
|
|
16
16
|
|
|
17
17
|
// ../workspace-tools/src/base/base-generator.ts
|
|
18
18
|
var withRunGenerator = (name, generatorFn, generatorOptions = {
|
|
19
19
|
skipReadingConfig: false
|
|
20
20
|
}) => async (tree, _options) => {
|
|
21
|
-
const stopwatch =
|
|
21
|
+
const stopwatch = _chunkPWR7XTOVjs.getStopwatch.call(void 0, name);
|
|
22
22
|
let options = _options;
|
|
23
23
|
let config;
|
|
24
24
|
try {
|
|
25
|
-
|
|
25
|
+
_chunkPWR7XTOVjs.writeInfo.call(void 0, `\u26A1 Running the ${name} generator...
|
|
26
26
|
|
|
27
27
|
`, config);
|
|
28
|
-
const workspaceRoot =
|
|
28
|
+
const workspaceRoot = _chunkPWR7XTOVjs.findWorkspaceRoot.call(void 0, );
|
|
29
29
|
if (!generatorOptions.skipReadingConfig) {
|
|
30
|
-
|
|
30
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0,
|
|
31
31
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
32
32
|
- workspaceRoot: ${workspaceRoot}`,
|
|
33
33
|
config
|
|
34
34
|
);
|
|
35
|
-
config = await
|
|
35
|
+
config = await _chunkPWR7XTOVjs.getConfig.call(void 0, workspaceRoot);
|
|
36
36
|
}
|
|
37
37
|
if (_optionalChain([generatorOptions, 'optionalAccess', _ => _.hooks, 'optionalAccess', _2 => _2.applyDefaultOptions])) {
|
|
38
|
-
|
|
38
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
39
39
|
options = await Promise.resolve(
|
|
40
40
|
generatorOptions.hooks.applyDefaultOptions(options, config)
|
|
41
41
|
);
|
|
42
|
-
|
|
42
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Completed the applyDefaultOptions hook", config);
|
|
43
43
|
}
|
|
44
|
-
|
|
44
|
+
_chunkPWR7XTOVjs.writeTrace.call(void 0,
|
|
45
45
|
`Generator schema options \u2699\uFE0F
|
|
46
46
|
${Object.keys(_nullishCoalesce(options, () => ( {}))).map((key) => ` - ${key}=${JSON.stringify(options[key])}`).join("\n")}`,
|
|
47
47
|
config
|
|
48
48
|
);
|
|
49
|
-
const tokenized = await
|
|
49
|
+
const tokenized = await _chunkCHFLC4ZXjs.applyWorkspaceTokens.call(void 0,
|
|
50
50
|
options,
|
|
51
51
|
{ workspaceRoot: tree.root, config },
|
|
52
|
-
|
|
52
|
+
_chunkCHFLC4ZXjs.applyWorkspaceBaseTokens
|
|
53
53
|
);
|
|
54
54
|
if (_optionalChain([generatorOptions, 'optionalAccess', _3 => _3.hooks, 'optionalAccess', _4 => _4.preProcess])) {
|
|
55
|
-
|
|
55
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Running the preProcess hook...", config);
|
|
56
56
|
await Promise.resolve(
|
|
57
57
|
generatorOptions.hooks.preProcess(tokenized, config)
|
|
58
58
|
);
|
|
59
|
-
|
|
59
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Completed the preProcess hook", config);
|
|
60
60
|
}
|
|
61
61
|
const result = await Promise.resolve(
|
|
62
62
|
generatorFn(tree, tokenized, config)
|
|
@@ -71,21 +71,21 @@ ${Object.keys(_nullishCoalesce(options, () => ( {}))).map((key) => ` - ${key}=${
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
if (_optionalChain([generatorOptions, 'optionalAccess', _14 => _14.hooks, 'optionalAccess', _15 => _15.postProcess])) {
|
|
74
|
-
|
|
74
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Running the postProcess hook...", config);
|
|
75
75
|
await Promise.resolve(generatorOptions.hooks.postProcess(config));
|
|
76
|
-
|
|
76
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Completed the postProcess hook", config);
|
|
77
77
|
}
|
|
78
78
|
return () => {
|
|
79
|
-
|
|
79
|
+
_chunkPWR7XTOVjs.writeSuccess.call(void 0, `Completed running the ${name} generator!
|
|
80
80
|
`, config);
|
|
81
81
|
};
|
|
82
82
|
} catch (error) {
|
|
83
83
|
return () => {
|
|
84
|
-
|
|
84
|
+
_chunkPWR7XTOVjs.writeFatal.call(void 0,
|
|
85
85
|
"A fatal error occurred while running the generator - the process was forced to terminate",
|
|
86
86
|
config
|
|
87
87
|
);
|
|
88
|
-
|
|
88
|
+
_chunkPWR7XTOVjs.writeError.call(void 0,
|
|
89
89
|
`An exception was thrown in the generator's process
|
|
90
90
|
- Details: ${error.message}
|
|
91
91
|
- Stacktrace: ${error.stack}`,
|
|
@@ -265,7 +265,7 @@ If this sounds interesting, and you would like to help us in creating the next g
|
|
|
265
265
|
var STORM_DEFAULT_ERROR_CODES_FILE = "tools/errors/codes.json";
|
|
266
266
|
|
|
267
267
|
// ../config/src/schema.ts
|
|
268
|
-
import z from "zod";
|
|
268
|
+
import * as z from "zod/v4";
|
|
269
269
|
var DarkColorSchema = z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1d1e22").describe("The dark background color of the workspace");
|
|
270
270
|
var LightColorSchema = z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#f4f4f5").describe("The light background color of the workspace");
|
|
271
271
|
var BrandColorSchema = z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1fb2a6").describe("The primary brand specific color of the workspace");
|
|
@@ -406,6 +406,15 @@ var errorConfigSchema = z.object({
|
|
|
406
406
|
"A URL to a page that looks up the workspace's error messages given a specific error code"
|
|
407
407
|
)
|
|
408
408
|
}).describe("The workspace's error config used during the error process");
|
|
409
|
+
var organizationConfigSchema = z.object({
|
|
410
|
+
name: z.string().trim().describe("The name of the organization"),
|
|
411
|
+
description: z.string().trim().optional().describe("A description of the organization"),
|
|
412
|
+
logo: z.string().trim().url().optional().describe("A URL to the organization's logo image"),
|
|
413
|
+
icon: z.string().trim().url().optional().describe("A URL to the organization's icon image"),
|
|
414
|
+
url: z.string().trim().url().optional().describe(
|
|
415
|
+
"A URL to a page that provides more information about the organization"
|
|
416
|
+
)
|
|
417
|
+
}).describe("The workspace's organization details");
|
|
409
418
|
var stormWorkspaceConfigSchema = z.object({
|
|
410
419
|
$schema: z.string().trim().default(
|
|
411
420
|
"https://cdn.jsdelivr.net/npm/@storm-software/config/schemas/storm-workspace.schema.json"
|
|
@@ -417,7 +426,9 @@ var stormWorkspaceConfigSchema = z.object({
|
|
|
417
426
|
"The name of the service/package/scope using this configuration"
|
|
418
427
|
),
|
|
419
428
|
namespace: z.string().trim().toLowerCase().optional().describe("The namespace of the package"),
|
|
420
|
-
organization: z.string().trim().
|
|
429
|
+
organization: organizationConfigSchema.or(z.string().trim().describe("The organization of the workspace")).optional().describe(
|
|
430
|
+
"The organization of the workspace. This can be a string or an object containing the organization's details"
|
|
431
|
+
),
|
|
421
432
|
repository: z.string().trim().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
|
|
422
433
|
license: z.string().trim().default("Apache-2.0").describe("The license type of the package"),
|
|
423
434
|
homepage: z.string().trim().url().optional().describe("The homepage of the workspace"),
|
|
@@ -470,7 +481,7 @@ var stormWorkspaceConfigSchema = z.object({
|
|
|
470
481
|
colors: ColorConfigSchema.or(ColorConfigMapSchema).describe(
|
|
471
482
|
"Storm theme config values used for styling various package elements"
|
|
472
483
|
),
|
|
473
|
-
extensions: z.record(z.any()).optional().default({}).describe("Configuration of each used extension")
|
|
484
|
+
extensions: z.record(z.string(), z.any()).optional().default({}).describe("Configuration of each used extension")
|
|
474
485
|
}).describe(
|
|
475
486
|
"Storm Workspace config values used during various dev-ops processes. This type is a combination of the StormPackageConfig and StormProject types. It represents the config of the entire monorepo."
|
|
476
487
|
);
|
|
@@ -964,7 +975,13 @@ var getConfigEnv = () => {
|
|
|
964
975
|
medium: process.env[`${prefix}ACCOUNT_MEDIUM`] || void 0,
|
|
965
976
|
github: process.env[`${prefix}ACCOUNT_GITHUB`] || void 0
|
|
966
977
|
},
|
|
967
|
-
organization: process.env[`${prefix}ORGANIZATION`] ||
|
|
978
|
+
organization: process.env[`${prefix}ORG`] || process.env[`${prefix}ORGANIZATION`] || process.env[`${prefix}ORG_NAME`] || process.env[`${prefix}ORGANIZATION_NAME`] ? process.env[`${prefix}ORG_DESCRIPTION`] || process.env[`${prefix}ORGANIZATION_DESCRIPTION`] || process.env[`${prefix}ORG_URL`] || process.env[`${prefix}ORGANIZATION_URL`] || process.env[`${prefix}ORG_LOGO`] || process.env[`${prefix}ORGANIZATION_LOGO`] ? {
|
|
979
|
+
name: process.env[`${prefix}ORG`] || process.env[`${prefix}ORGANIZATION`] || process.env[`${prefix}ORG_NAME`] || process.env[`${prefix}ORGANIZATION_NAME`],
|
|
980
|
+
description: process.env[`${prefix}ORG_DESCRIPTION`] || process.env[`${prefix}ORGANIZATION_DESCRIPTION`] || void 0,
|
|
981
|
+
url: process.env[`${prefix}ORG_URL`] || process.env[`${prefix}ORGANIZATION_URL`] || void 0,
|
|
982
|
+
logo: process.env[`${prefix}ORG_LOGO`] || process.env[`${prefix}ORGANIZATION_LOGO`] || void 0,
|
|
983
|
+
icon: process.env[`${prefix}ORG_ICON`] || process.env[`${prefix}ORGANIZATION_ICON`] || void 0
|
|
984
|
+
} : process.env[`${prefix}ORG`] || process.env[`${prefix}ORGANIZATION`] || process.env[`${prefix}ORG_NAME`] || process.env[`${prefix}ORGANIZATION_NAME`] : void 0,
|
|
968
985
|
packageManager: process.env[`${prefix}PACKAGE_MANAGER`] || void 0,
|
|
969
986
|
license: process.env[`${prefix}LICENSE`] || void 0,
|
|
970
987
|
homepage: process.env[`${prefix}HOMEPAGE`] || void 0,
|
|
@@ -1171,7 +1188,33 @@ var setConfigEnv = (config) => {
|
|
|
1171
1188
|
}
|
|
1172
1189
|
}
|
|
1173
1190
|
if (config.organization) {
|
|
1174
|
-
|
|
1191
|
+
if (typeof config.organization === "string") {
|
|
1192
|
+
process.env[`${prefix}ORG`] = config.organization;
|
|
1193
|
+
process.env[`${prefix}ORG_NAME`] = config.organization;
|
|
1194
|
+
process.env[`${prefix}ORGANIZATION`] = config.organization;
|
|
1195
|
+
process.env[`${prefix}ORGANIZATION_NAME`] = config.organization;
|
|
1196
|
+
} else {
|
|
1197
|
+
process.env[`${prefix}ORG`] = config.organization.name;
|
|
1198
|
+
process.env[`${prefix}ORG_NAME`] = config.organization.name;
|
|
1199
|
+
process.env[`${prefix}ORGANIZATION`] = config.organization.name;
|
|
1200
|
+
process.env[`${prefix}ORGANIZATION_NAME`] = config.organization.name;
|
|
1201
|
+
if (config.organization.url) {
|
|
1202
|
+
process.env[`${prefix}ORG_URL`] = config.organization.url;
|
|
1203
|
+
process.env[`${prefix}ORGANIZATION_URL`] = config.organization.url;
|
|
1204
|
+
}
|
|
1205
|
+
if (config.organization.description) {
|
|
1206
|
+
process.env[`${prefix}ORG_DESCRIPTION`] = config.organization.description;
|
|
1207
|
+
process.env[`${prefix}ORGANIZATION_DESCRIPTION`] = config.organization.description;
|
|
1208
|
+
}
|
|
1209
|
+
if (config.organization.logo) {
|
|
1210
|
+
process.env[`${prefix}ORG_LOGO`] = config.organization.logo;
|
|
1211
|
+
process.env[`${prefix}ORGANIZATION_LOGO`] = config.organization.logo;
|
|
1212
|
+
}
|
|
1213
|
+
if (config.organization.icon) {
|
|
1214
|
+
process.env[`${prefix}ORG_ICON`] = config.organization.icon;
|
|
1215
|
+
process.env[`${prefix}ORGANIZATION_ICON`] = config.organization.icon;
|
|
1216
|
+
}
|
|
1217
|
+
}
|
|
1175
1218
|
}
|
|
1176
1219
|
if (config.packageManager) {
|
|
1177
1220
|
process.env[`${prefix}PACKAGE_MANAGER`] = config.packageManager;
|
|
@@ -8,7 +8,7 @@ var _chunkXZP5ZUYNjs = require('./chunk-XZP5ZUYN.js');
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _chunkPWR7XTOVjs = require('./chunk-PWR7XTOV.js');
|
|
12
12
|
|
|
13
13
|
// src/plugins/docker/_dockerfile.ts
|
|
14
14
|
|
|
@@ -41,8 +41,8 @@ var createNodesV2 = [
|
|
|
41
41
|
if (_optionalChain([projectJson, 'optionalAccess', _ => _.name])) {
|
|
42
42
|
return {};
|
|
43
43
|
}
|
|
44
|
-
const workspaceRoot =
|
|
45
|
-
const config = await
|
|
44
|
+
const workspaceRoot = _chunkPWR7XTOVjs.findWorkspaceRoot.call(void 0, );
|
|
45
|
+
const config = await _chunkPWR7XTOVjs.getConfig.call(void 0, workspaceRoot);
|
|
46
46
|
Object.keys(projectJson).forEach((key) => {
|
|
47
47
|
if (!project[key]) {
|
|
48
48
|
project[key] = projectJson[key];
|
|
@@ -56,8 +56,12 @@ var createNodesV2 = [
|
|
|
56
56
|
const labels = [
|
|
57
57
|
`org.opencontainers.image.ref.name=${project.name}`,
|
|
58
58
|
`org.opencontainers.image.title=${titleCase(project.name)}`,
|
|
59
|
-
`org.opencontainers.image.authors=${config.organization ? titleCase(
|
|
60
|
-
|
|
59
|
+
`org.opencontainers.image.authors=${config.organization ? titleCase(
|
|
60
|
+
typeof config.organization === "string" ? config.organization : config.organization.name
|
|
61
|
+
) : "Storm Software"}`,
|
|
62
|
+
`org.opencontainers.image.vendor=${config.organization ? titleCase(
|
|
63
|
+
typeof config.organization === "string" ? config.organization : config.organization.name
|
|
64
|
+
) : "Storm Software"}`,
|
|
61
65
|
`org.opencontainers.image.documentation=${config.docs}`,
|
|
62
66
|
`org.opencontainers.image.url=${config.homepage}`,
|
|
63
67
|
`org.opencontainers.image.source=${config.repository}`
|
|
@@ -90,7 +94,7 @@ var createNodesV2 = [
|
|
|
90
94
|
metadata: {
|
|
91
95
|
images: [
|
|
92
96
|
`${config.namespace ? config.namespace : "storm-software"}/${_optionalChain([project, 'access', _3 => _3.name, 'optionalAccess', _4 => _4.replace, 'call', _5 => _5(`${config.namespace}-`, "")])}`,
|
|
93
|
-
`ghcr.io/${config.organization ? config.organization : "storm-software"}/${project.name}`
|
|
97
|
+
`ghcr.io/${(typeof config.organization === "string" ? config.organization : _optionalChain([config, 'access', _6 => _6.organization, 'optionalAccess', _7 => _7.name])) || "storm-software"}/${project.name}`
|
|
94
98
|
],
|
|
95
99
|
tags: [
|
|
96
100
|
"type=schedule",
|
|
@@ -164,7 +168,7 @@ var createNodesV2 = [
|
|
|
164
168
|
release: {
|
|
165
169
|
...project.release,
|
|
166
170
|
version: {
|
|
167
|
-
..._optionalChain([project, 'access',
|
|
171
|
+
..._optionalChain([project, 'access', _8 => _8.release, 'optionalAccess', _9 => _9.version]),
|
|
168
172
|
generator: "@storm-software/workspace-tools:release-version"
|
|
169
173
|
}
|
|
170
174
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
applyWorkspaceBaseTokens,
|
|
3
3
|
applyWorkspaceTokens
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-45BSPPHW.mjs";
|
|
5
5
|
import {
|
|
6
6
|
findWorkspaceRoot,
|
|
7
7
|
getConfig,
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
writeInfo,
|
|
13
13
|
writeSuccess,
|
|
14
14
|
writeTrace
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-4TLAGM7Q.mjs";
|
|
16
16
|
|
|
17
17
|
// ../workspace-tools/src/base/base-generator.ts
|
|
18
18
|
var withRunGenerator = (name, generatorFn, generatorOptions = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunkPWR7XTOVjs = require('./chunk-PWR7XTOV.js');
|
|
4
4
|
|
|
5
5
|
// ../config-tools/src/utilities/apply-workspace-tokens.ts
|
|
6
6
|
var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
@@ -37,7 +37,7 @@ var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
|
37
37
|
if (result.includes("{workspaceRoot}")) {
|
|
38
38
|
result = result.replaceAll(
|
|
39
39
|
"{workspaceRoot}",
|
|
40
|
-
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _2 => _2.config, 'optionalAccess', _3 => _3.workspaceRoot]))), () => (
|
|
40
|
+
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _2 => _2.config, 'optionalAccess', _3 => _3.workspaceRoot]))), () => ( _chunkPWR7XTOVjs.findWorkspaceRoot.call(void 0, )))
|
|
41
41
|
);
|
|
42
42
|
}
|
|
43
43
|
return result;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
var
|
|
4
|
+
var _chunkCHFLC4ZXjs = require('./chunk-CHFLC4ZX.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
@@ -14,7 +14,7 @@ var _chunkY5PTY4MDjs = require('./chunk-Y5PTY4MD.js');
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
|
|
17
|
-
var
|
|
17
|
+
var _chunkPWR7XTOVjs = require('./chunk-PWR7XTOV.js');
|
|
18
18
|
|
|
19
19
|
|
|
20
20
|
var _chunk4AADQIGWjs = require('./chunk-4AADQIGW.js');
|
|
@@ -22,7 +22,7 @@ var _chunk4AADQIGWjs = require('./chunk-4AADQIGW.js');
|
|
|
22
22
|
// ../workspace-tools/src/base/base-executor.ts
|
|
23
23
|
var _defu = require('defu');
|
|
24
24
|
var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_options, context) => {
|
|
25
|
-
const stopwatch =
|
|
25
|
+
const stopwatch = _chunkPWR7XTOVjs.getStopwatch.call(void 0, name);
|
|
26
26
|
let options = _options;
|
|
27
27
|
let config = {};
|
|
28
28
|
try {
|
|
@@ -31,14 +31,14 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
31
31
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
32
32
|
);
|
|
33
33
|
}
|
|
34
|
-
const workspaceRoot =
|
|
34
|
+
const workspaceRoot = _chunkPWR7XTOVjs.findWorkspaceRoot.call(void 0, );
|
|
35
35
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot;
|
|
36
36
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot;
|
|
37
37
|
const projectName = context.projectName;
|
|
38
38
|
config.workspaceRoot = workspaceRoot;
|
|
39
|
-
|
|
39
|
+
_chunkPWR7XTOVjs.writeInfo.call(void 0, `\u26A1 Running the ${name} executor for ${projectName} `, config);
|
|
40
40
|
if (!executorOptions.skipReadingConfig) {
|
|
41
|
-
|
|
41
|
+
_chunkPWR7XTOVjs.writeTrace.call(void 0,
|
|
42
42
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
43
43
|
- workspaceRoot: ${workspaceRoot}
|
|
44
44
|
- projectRoot: ${projectRoot}
|
|
@@ -47,42 +47,42 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
47
47
|
`,
|
|
48
48
|
config
|
|
49
49
|
);
|
|
50
|
-
config = await
|
|
50
|
+
config = await _chunkPWR7XTOVjs.getConfig.call(void 0, workspaceRoot);
|
|
51
51
|
}
|
|
52
52
|
if (_optionalChain([executorOptions, 'optionalAccess', _3 => _3.hooks, 'optionalAccess', _4 => _4.applyDefaultOptions])) {
|
|
53
|
-
|
|
53
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
54
54
|
options = await Promise.resolve(
|
|
55
55
|
executorOptions.hooks.applyDefaultOptions(options, config)
|
|
56
56
|
);
|
|
57
|
-
|
|
57
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Completed the applyDefaultOptions hook", config);
|
|
58
58
|
}
|
|
59
|
-
|
|
59
|
+
_chunkPWR7XTOVjs.writeTrace.call(void 0,
|
|
60
60
|
`Executor schema options \u2699\uFE0F
|
|
61
|
-
${
|
|
61
|
+
${_chunkPWR7XTOVjs.formatLogMessage.call(void 0, options)}
|
|
62
62
|
`,
|
|
63
63
|
config
|
|
64
64
|
);
|
|
65
|
-
const tokenized = await
|
|
65
|
+
const tokenized = await _chunkCHFLC4ZXjs.applyWorkspaceTokens.call(void 0,
|
|
66
66
|
options,
|
|
67
67
|
_defu.defu.call(void 0,
|
|
68
68
|
{ workspaceRoot, projectRoot, sourceRoot, projectName, config },
|
|
69
69
|
config,
|
|
70
70
|
context.projectsConfigurations.projects[context.projectName]
|
|
71
71
|
),
|
|
72
|
-
|
|
72
|
+
_chunkCHFLC4ZXjs.applyWorkspaceProjectTokens
|
|
73
73
|
);
|
|
74
|
-
|
|
74
|
+
_chunkPWR7XTOVjs.writeTrace.call(void 0,
|
|
75
75
|
`Executor schema tokenized options \u2699\uFE0F
|
|
76
|
-
${
|
|
76
|
+
${_chunkPWR7XTOVjs.formatLogMessage.call(void 0, tokenized)}
|
|
77
77
|
`,
|
|
78
78
|
config
|
|
79
79
|
);
|
|
80
80
|
if (_optionalChain([executorOptions, 'optionalAccess', _5 => _5.hooks, 'optionalAccess', _6 => _6.preProcess])) {
|
|
81
|
-
|
|
81
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Running the preProcess hook...", config);
|
|
82
82
|
await Promise.resolve(
|
|
83
83
|
executorOptions.hooks.preProcess(tokenized, config)
|
|
84
84
|
);
|
|
85
|
-
|
|
85
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Completed the preProcess hook", config);
|
|
86
86
|
}
|
|
87
87
|
const ret = executorFn(tokenized, context, config);
|
|
88
88
|
if (_isFunction(_optionalChain([ret, 'optionalAccess', _7 => _7.next]))) {
|
|
@@ -95,9 +95,9 @@ ${_chunk3WCZTKAHjs.formatLogMessage.call(void 0, tokenized)}
|
|
|
95
95
|
ret
|
|
96
96
|
);
|
|
97
97
|
if (result && (!result.success || result.error && _optionalChain([result, 'optionalAccess', _8 => _8.error, 'optionalAccess', _9 => _9.message]) && typeof _optionalChain([result, 'optionalAccess', _10 => _10.error, 'optionalAccess', _11 => _11.message]) === "string" && _optionalChain([result, 'optionalAccess', _12 => _12.error, 'optionalAccess', _13 => _13.name]) && typeof _optionalChain([result, 'optionalAccess', _14 => _14.error, 'optionalAccess', _15 => _15.name]) === "string")) {
|
|
98
|
-
|
|
98
|
+
_chunkPWR7XTOVjs.writeTrace.call(void 0,
|
|
99
99
|
`Failure determined by the ${name} executor
|
|
100
|
-
${
|
|
100
|
+
${_chunkPWR7XTOVjs.formatLogMessage.call(void 0, result)}`,
|
|
101
101
|
config
|
|
102
102
|
);
|
|
103
103
|
console.error(result);
|
|
@@ -106,21 +106,21 @@ ${_chunk3WCZTKAHjs.formatLogMessage.call(void 0, result)}`,
|
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
108
|
if (_optionalChain([executorOptions, 'optionalAccess', _17 => _17.hooks, 'optionalAccess', _18 => _18.postProcess])) {
|
|
109
|
-
|
|
109
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Running the postProcess hook...", config);
|
|
110
110
|
await Promise.resolve(executorOptions.hooks.postProcess(config));
|
|
111
|
-
|
|
111
|
+
_chunkPWR7XTOVjs.writeDebug.call(void 0, "Completed the postProcess hook", config);
|
|
112
112
|
}
|
|
113
|
-
|
|
113
|
+
_chunkPWR7XTOVjs.writeSuccess.call(void 0, `Completed running the ${name} task executor!
|
|
114
114
|
`, config);
|
|
115
115
|
return {
|
|
116
116
|
success: true
|
|
117
117
|
};
|
|
118
118
|
} catch (error) {
|
|
119
|
-
|
|
119
|
+
_chunkPWR7XTOVjs.writeFatal.call(void 0,
|
|
120
120
|
"A fatal error occurred while running the executor - the process was forced to terminate",
|
|
121
121
|
config
|
|
122
122
|
);
|
|
123
|
-
|
|
123
|
+
_chunkPWR7XTOVjs.writeError.call(void 0,
|
|
124
124
|
`An exception was thrown in the executor's process
|
|
125
125
|
- Details: ${error.message}
|
|
126
126
|
- Stacktrace: ${error.stack}`,
|
|
@@ -172,7 +172,7 @@ async function serveExecutor(options, context, config) {
|
|
|
172
172
|
remote: options.remote
|
|
173
173
|
});
|
|
174
174
|
} else {
|
|
175
|
-
|
|
175
|
+
_chunkPWR7XTOVjs.writeWarning.call(void 0, `Chart packaged at: ${chartPath}`, config);
|
|
176
176
|
}
|
|
177
177
|
return {
|
|
178
178
|
success: true
|