@storm-software/k8s-tools 0.24.18 → 0.24.20
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 +12 -0
- package/README.md +1 -1
- package/dist/{chunk-PWKJRDCH.js → chunk-2C43HDIG.js} +25 -25
- package/dist/{chunk-7TA6J7QQ.js → chunk-3LDSSIYN.js} +41 -24
- package/dist/{chunk-OEJGOWJQ.js → chunk-5RAMGCAN.js} +6 -6
- package/dist/{chunk-BDOS45JX.mjs → chunk-7GT66TVR.mjs} +1 -1
- package/dist/{chunk-4OFIALUE.js → chunk-AT2U3AEC.js} +4 -4
- package/dist/{chunk-LVPECYEE.mjs → chunk-BC6ZCGP5.mjs} +2 -2
- package/dist/{chunk-T4EJFEH2.mjs → chunk-BMNL7V2X.mjs} +2 -2
- package/dist/{chunk-6BGIVOOB.js → chunk-CHM4YATC.js} +2 -2
- package/dist/{chunk-YTPPS4F6.mjs → chunk-IJTLD5NO.mjs} +1 -1
- package/dist/{chunk-BJY7KKSA.js → chunk-IK63SZPH.js} +3 -3
- package/dist/{chunk-LPWEVVQ3.mjs → chunk-J5BO7GPJ.mjs} +2 -2
- package/dist/{chunk-AAGAUBO2.mjs → chunk-KM4H3E6A.mjs} +41 -24
- package/dist/{chunk-M26TA6KY.mjs → chunk-KRKB2SNZ.mjs} +2 -2
- package/dist/{chunk-M5GQ34NS.js → chunk-QPLVLMOV.js} +19 -19
- package/dist/{chunk-44HYG5MT.mjs → chunk-RERIZQ7X.mjs} +2 -2
- package/dist/{chunk-RMEVS7VZ.js → chunk-WYOYGK3F.js} +4 -4
- package/dist/{executor-Bdz-Mv0J.d.mts → executor-CTUr2DgM.d.mts} +1 -1
- package/dist/{executor-C8P1WXgN.d.ts → executor-DLseHK-r.d.ts} +1 -1
- package/dist/executors.d.mts +2 -2
- package/dist/executors.d.ts +2 -2
- package/dist/executors.js +5 -5
- package/dist/executors.mjs +4 -4
- package/dist/{generator-8uXPNFWN.d.mts → generator-9X_TkrLo.d.mts} +1 -1
- package/dist/{generator-cmhbMmbg.d.mts → generator-DXlS5Rqg.d.mts} +1 -1
- package/dist/{generator-CYcHfQas.d.ts → generator-DeLkEJCT.d.ts} +1 -1
- package/dist/{generator-BmLTcTjN.d.ts → generator-wcSR1cxi.d.ts} +1 -1
- package/dist/generators.d.mts +3 -3
- package/dist/generators.d.ts +3 -3
- package/dist/generators.js +6 -6
- package/dist/generators.mjs +5 -5
- package/dist/index.d.mts +4 -4
- package/dist/index.d.ts +4 -4
- package/dist/index.js +9 -9
- package/dist/index.mjs +8 -8
- package/dist/src/executors/container-publish/executor.d.mts +1 -1
- package/dist/src/executors/container-publish/executor.d.ts +1 -1
- 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.d.mts +2 -2
- package/dist/src/executors/helm-package/executor.d.ts +2 -2
- 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.d.mts +2 -2
- package/dist/src/generators/helm-chart/generator.d.ts +2 -2
- 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.d.mts +2 -2
- package/dist/src/generators/helm-dependency/generator.d.ts +2 -2
- 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/dist/{types-CMF_wowV.d.mts → types-HiZpltUX.d.mts} +3 -0
- package/dist/{types-CMF_wowV.d.ts → types-HiZpltUX.d.ts} +3 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## 0.24.20 (2025-01-29)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous
|
|
4
|
+
|
|
5
|
+
- **monorepo:** Regenerate README markdown files ([a1b6717d](https://github.com/storm-software/storm-ops/commit/a1b6717d))
|
|
6
|
+
|
|
7
|
+
## 0.24.19 (2025-01-29)
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
- **unbuild:** Resolved issue applying plugins ([21459fd0](https://github.com/storm-software/storm-ops/commit/21459fd0))
|
|
12
|
+
|
|
1
13
|
## 0.24.18 (2025-01-29)
|
|
2
14
|
|
|
3
15
|
### 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,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 _chunkCHM4YATCjs = require('./chunk-CHM4YATC.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
@@ -14,7 +14,7 @@ var _chunk6BGIVOOBjs = require('./chunk-6BGIVOOB.js');
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
|
|
17
|
-
var
|
|
17
|
+
var _chunk3LDSSIYNjs = require('./chunk-3LDSSIYN.js');
|
|
18
18
|
|
|
19
19
|
|
|
20
20
|
var _chunk2GAU2GHGjs = require('./chunk-2GAU2GHG.js');
|
|
@@ -25,52 +25,52 @@ var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
|
25
25
|
// ../workspace-tools/src/base/base-executor.ts
|
|
26
26
|
var _defu = require('defu');
|
|
27
27
|
var withRunExecutor = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (name, executorFn, executorOptions = {}) => async (_options, context) => {
|
|
28
|
-
const stopwatch =
|
|
28
|
+
const stopwatch = _chunk3LDSSIYNjs.getStopwatch.call(void 0, name);
|
|
29
29
|
let options = _options;
|
|
30
30
|
let config = {};
|
|
31
31
|
try {
|
|
32
32
|
if (!_optionalChain([context, 'access', _ => _.projectsConfigurations, 'optionalAccess', _2 => _2.projects]) || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
|
|
33
33
|
throw new Error("The Build process failed because the context is not valid. Please run this command from a workspace.");
|
|
34
34
|
}
|
|
35
|
-
const workspaceRoot =
|
|
35
|
+
const workspaceRoot = _chunk3LDSSIYNjs.findWorkspaceRoot.call(void 0, );
|
|
36
36
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot;
|
|
37
37
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot;
|
|
38
38
|
const projectName = context.projectName;
|
|
39
39
|
config.workspaceRoot = workspaceRoot;
|
|
40
|
-
|
|
40
|
+
_chunk3LDSSIYNjs.writeInfo.call(void 0, `
|
|
41
41
|
\u26A1 Running the ${name} executor for ${projectName}
|
|
42
42
|
`, config);
|
|
43
43
|
if (!executorOptions.skipReadingConfig) {
|
|
44
|
-
|
|
44
|
+
_chunk3LDSSIYNjs.writeTrace.call(void 0, `Loading the Storm Config from environment variables and storm.config.js file...
|
|
45
45
|
- workspaceRoot: ${workspaceRoot}
|
|
46
46
|
- projectRoot: ${projectRoot}
|
|
47
47
|
- sourceRoot: ${sourceRoot}
|
|
48
48
|
- projectName: ${projectName}
|
|
49
49
|
`, config);
|
|
50
|
-
config = await
|
|
50
|
+
config = await _chunk3LDSSIYNjs.getConfig.call(void 0, workspaceRoot);
|
|
51
51
|
}
|
|
52
52
|
if (_optionalChain([executorOptions, 'optionalAccess', _3 => _3.hooks, 'optionalAccess', _4 => _4.applyDefaultOptions])) {
|
|
53
|
-
|
|
53
|
+
_chunk3LDSSIYNjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
54
54
|
options = await Promise.resolve(executorOptions.hooks.applyDefaultOptions(options, config));
|
|
55
|
-
|
|
55
|
+
_chunk3LDSSIYNjs.writeDebug.call(void 0, "Completed the applyDefaultOptions hook", config);
|
|
56
56
|
}
|
|
57
|
-
|
|
58
|
-
${
|
|
57
|
+
_chunk3LDSSIYNjs.writeTrace.call(void 0, `Executor schema options \u2699\uFE0F
|
|
58
|
+
${_chunk3LDSSIYNjs.formatLogMessage.call(void 0, options)}
|
|
59
59
|
`, config);
|
|
60
|
-
const tokenized = await
|
|
60
|
+
const tokenized = await _chunkCHM4YATCjs.applyWorkspaceTokens.call(void 0, options, _defu.defu.call(void 0, {
|
|
61
61
|
workspaceRoot,
|
|
62
62
|
projectRoot,
|
|
63
63
|
sourceRoot,
|
|
64
64
|
projectName,
|
|
65
65
|
config
|
|
66
|
-
}, config, context.projectsConfigurations.projects[context.projectName]),
|
|
67
|
-
|
|
68
|
-
${
|
|
66
|
+
}, config, context.projectsConfigurations.projects[context.projectName]), _chunkCHM4YATCjs.applyWorkspaceProjectTokens);
|
|
67
|
+
_chunk3LDSSIYNjs.writeTrace.call(void 0, `Executor schema tokenized options \u2699\uFE0F
|
|
68
|
+
${_chunk3LDSSIYNjs.formatLogMessage.call(void 0, tokenized)}
|
|
69
69
|
`, config);
|
|
70
70
|
if (_optionalChain([executorOptions, 'optionalAccess', _5 => _5.hooks, 'optionalAccess', _6 => _6.preProcess])) {
|
|
71
|
-
|
|
71
|
+
_chunk3LDSSIYNjs.writeDebug.call(void 0, "Running the preProcess hook...", config);
|
|
72
72
|
await Promise.resolve(executorOptions.hooks.preProcess(tokenized, config));
|
|
73
|
-
|
|
73
|
+
_chunk3LDSSIYNjs.writeDebug.call(void 0, "Completed the preProcess hook", config);
|
|
74
74
|
}
|
|
75
75
|
const ret = executorFn(tokenized, context, config);
|
|
76
76
|
if (_isFunction(_optionalChain([ret, 'optionalAccess', _7 => _7.next]))) {
|
|
@@ -80,26 +80,26 @@ ${_chunk7TA6J7QQjs.formatLogMessage.call(void 0, tokenized)}
|
|
|
80
80
|
}
|
|
81
81
|
const result = await Promise.resolve(ret);
|
|
82
82
|
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")) {
|
|
83
|
-
|
|
84
|
-
${
|
|
83
|
+
_chunk3LDSSIYNjs.writeTrace.call(void 0, `Failure determined by the ${name} executor
|
|
84
|
+
${_chunk3LDSSIYNjs.formatLogMessage.call(void 0, result)}`, config);
|
|
85
85
|
console.error(result);
|
|
86
86
|
throw new Error(`The ${name} executor failed to run`, {
|
|
87
87
|
cause: _optionalChain([result, 'optionalAccess', _16 => _16.error])
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
if (_optionalChain([executorOptions, 'optionalAccess', _17 => _17.hooks, 'optionalAccess', _18 => _18.postProcess])) {
|
|
91
|
-
|
|
91
|
+
_chunk3LDSSIYNjs.writeDebug.call(void 0, "Running the postProcess hook...", config);
|
|
92
92
|
await Promise.resolve(executorOptions.hooks.postProcess(config));
|
|
93
|
-
|
|
93
|
+
_chunk3LDSSIYNjs.writeDebug.call(void 0, "Completed the postProcess hook", config);
|
|
94
94
|
}
|
|
95
|
-
|
|
95
|
+
_chunk3LDSSIYNjs.writeSuccess.call(void 0, `Completed running the ${name} task executor!
|
|
96
96
|
`, config);
|
|
97
97
|
return {
|
|
98
98
|
success: true
|
|
99
99
|
};
|
|
100
100
|
} catch (error) {
|
|
101
|
-
|
|
102
|
-
|
|
101
|
+
_chunk3LDSSIYNjs.writeFatal.call(void 0, "A fatal error occurred while running the executor - the process was forced to terminate", config);
|
|
102
|
+
_chunk3LDSSIYNjs.writeError.call(void 0, `An exception was thrown in the executor's process
|
|
103
103
|
- Details: ${error.message}
|
|
104
104
|
- Stacktrace: ${error.stack}`, config);
|
|
105
105
|
return {
|
|
@@ -148,7 +148,7 @@ async function serveExecutor(options, context, config) {
|
|
|
148
148
|
remote: options.remote
|
|
149
149
|
});
|
|
150
150
|
} else {
|
|
151
|
-
|
|
151
|
+
_chunk3LDSSIYNjs.writeWarning.call(void 0, `Chart packaged at: ${chartPath}`, config);
|
|
152
152
|
}
|
|
153
153
|
return {
|
|
154
154
|
success: true
|
|
@@ -134,14 +134,17 @@ var _fs = require('fs');
|
|
|
134
134
|
var _path = require('path');
|
|
135
135
|
var MAX_PATH_SEARCH_DEPTH = 30;
|
|
136
136
|
var depth = 0;
|
|
137
|
-
function findFolderUp(startPath, endFileNames) {
|
|
137
|
+
function findFolderUp(startPath, endFileNames = [], endDirectoryNames = []) {
|
|
138
138
|
const _startPath = _nullishCoalesce(startPath, () => ( process.cwd()));
|
|
139
|
+
if (endDirectoryNames.some((endDirName) => _fs.existsSync.call(void 0, _path.join.call(void 0, _startPath, endDirName)))) {
|
|
140
|
+
return _startPath;
|
|
141
|
+
}
|
|
139
142
|
if (endFileNames.some((endFileName) => _fs.existsSync.call(void 0, _path.join.call(void 0, _startPath, endFileName)))) {
|
|
140
143
|
return _startPath;
|
|
141
144
|
}
|
|
142
145
|
if (_startPath !== "/" && depth++ < MAX_PATH_SEARCH_DEPTH) {
|
|
143
146
|
const parent = _path.join.call(void 0, _startPath, "..");
|
|
144
|
-
return findFolderUp(parent, endFileNames);
|
|
147
|
+
return findFolderUp(parent, endFileNames, endDirectoryNames);
|
|
145
148
|
}
|
|
146
149
|
return void 0;
|
|
147
150
|
}
|
|
@@ -149,17 +152,17 @@ _chunk3GQAWCBQjs.__name.call(void 0, findFolderUp, "findFolderUp");
|
|
|
149
152
|
|
|
150
153
|
// ../config-tools/src/utilities/find-workspace-root.ts
|
|
151
154
|
var rootFiles = [
|
|
152
|
-
"storm.json",
|
|
153
|
-
"storm.json",
|
|
154
|
-
"storm.yaml",
|
|
155
|
-
"storm.yml",
|
|
156
|
-
"storm.js",
|
|
157
|
-
"storm.ts",
|
|
158
|
-
".storm.json",
|
|
159
|
-
".storm.yaml",
|
|
160
|
-
".storm.yml",
|
|
161
|
-
".storm.js",
|
|
162
|
-
".storm.ts",
|
|
155
|
+
"storm-workspace.json",
|
|
156
|
+
"storm-workspace.json",
|
|
157
|
+
"storm-workspace.yaml",
|
|
158
|
+
"storm-workspace.yml",
|
|
159
|
+
"storm-workspace.js",
|
|
160
|
+
"storm-workspace.ts",
|
|
161
|
+
".storm-workspace.json",
|
|
162
|
+
".storm-workspace.yaml",
|
|
163
|
+
".storm-workspace.yml",
|
|
164
|
+
".storm-workspace.js",
|
|
165
|
+
".storm-workspace.ts",
|
|
163
166
|
"lerna.json",
|
|
164
167
|
"nx.json",
|
|
165
168
|
"turbo.json",
|
|
@@ -183,11 +186,18 @@ var rootFiles = [
|
|
|
183
186
|
"pnpm-lock.yml",
|
|
184
187
|
"bun.lockb"
|
|
185
188
|
];
|
|
189
|
+
var rootDirectories = [
|
|
190
|
+
".storm-workspace",
|
|
191
|
+
".nx",
|
|
192
|
+
".github",
|
|
193
|
+
".vscode",
|
|
194
|
+
".verdaccio"
|
|
195
|
+
];
|
|
186
196
|
function findWorkspaceRootSafe(pathInsideMonorepo) {
|
|
187
197
|
if (process.env.STORM_WORKSPACE_ROOT || process.env.NX_WORKSPACE_ROOT_PATH) {
|
|
188
198
|
return correctPaths(_nullishCoalesce(process.env.STORM_WORKSPACE_ROOT, () => ( process.env.NX_WORKSPACE_ROOT_PATH)));
|
|
189
199
|
}
|
|
190
|
-
return correctPaths(findFolderUp(_nullishCoalesce(pathInsideMonorepo, () => ( process.cwd())), rootFiles));
|
|
200
|
+
return correctPaths(findFolderUp(_nullishCoalesce(pathInsideMonorepo, () => ( process.cwd())), rootFiles, rootDirectories));
|
|
191
201
|
}
|
|
192
202
|
_chunk3GQAWCBQjs.__name.call(void 0, findWorkspaceRootSafe, "findWorkspaceRootSafe");
|
|
193
203
|
function findWorkspaceRoot(pathInsideMonorepo) {
|
|
@@ -329,7 +339,7 @@ var WorkspaceDirectoryConfigSchema = _zod2.default.object({
|
|
|
329
339
|
build: _zod2.default.string().trim().default("dist").describe("The directory used to store the workspace's distributable files after a build (relative to the workspace root)")
|
|
330
340
|
}).describe("Various directories used by the workspace to store data, cache, and configuration files");
|
|
331
341
|
var StormConfigSchema = _zod2.default.object({
|
|
332
|
-
$schema: _zod2.default.string().trim().default("https://cdn.jsdelivr.net/npm/@storm-software/config/schemas/storm.schema.json").optional().nullish().describe("The URL to the JSON schema file that describes the Storm configuration file"),
|
|
342
|
+
$schema: _zod2.default.string().trim().default("https://cdn.jsdelivr.net/npm/@storm-software/config/schemas/storm-workspace.schema.json").optional().nullish().describe("The URL to the JSON schema file that describes the Storm configuration file"),
|
|
333
343
|
extends: ExtendsSchema.optional(),
|
|
334
344
|
name: _zod2.default.string().trim().toLowerCase().optional().describe("The name of the service/package/scope using this configuration"),
|
|
335
345
|
namespace: _zod2.default.string().trim().toLowerCase().optional().describe("The namespace of the package"),
|
|
@@ -371,6 +381,7 @@ var StormConfigSchema = _zod2.default.object({
|
|
|
371
381
|
"trace",
|
|
372
382
|
"all"
|
|
373
383
|
]).default("info").describe("The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."),
|
|
384
|
+
skipConfigLogging: _zod2.default.boolean().optional().describe("Should the logging of the current Storm Workspace configuration be skipped?"),
|
|
374
385
|
registry: RegistryConfigSchema,
|
|
375
386
|
configFile: _zod2.default.string().trim().nullable().default(null).describe("The filepath of the Storm config. When this field is null, no config file was found in the current workspace."),
|
|
376
387
|
colors: ColorConfigSchema.or(ColorConfigMapSchema).describe("Storm theme config values used for styling various package elements"),
|
|
@@ -727,10 +738,10 @@ var getConfigFileByName = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, a
|
|
|
727
738
|
}, "getConfigFileByName");
|
|
728
739
|
var getConfigFile = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (filePath, additionalFileNames = []) => {
|
|
729
740
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
730
|
-
const result = await getConfigFileByName("storm", workspacePath);
|
|
741
|
+
const result = await getConfigFileByName("storm-workspace", workspacePath);
|
|
731
742
|
let config = result.config;
|
|
732
743
|
const configFile = result.configFile;
|
|
733
|
-
if (config && configFile && Object.keys(config).length > 0) {
|
|
744
|
+
if (config && configFile && Object.keys(config).length > 0 && !config.skipConfigLogging) {
|
|
734
745
|
writeTrace(`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`, {
|
|
735
746
|
logLevel: "all"
|
|
736
747
|
});
|
|
@@ -739,9 +750,11 @@ var getConfigFile = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (
|
|
|
739
750
|
const results = await Promise.all(additionalFileNames.map((fileName) => getConfigFileByName(fileName, workspacePath)));
|
|
740
751
|
for (const result2 of results) {
|
|
741
752
|
if (_optionalChain([result2, 'optionalAccess', _30 => _30.config]) && _optionalChain([result2, 'optionalAccess', _31 => _31.configFile]) && Object.keys(result2.config).length > 0) {
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
753
|
+
if (!config.skipConfigLogging && !result2.config.skipConfigLogging) {
|
|
754
|
+
writeTrace(`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`, {
|
|
755
|
+
logLevel: "all"
|
|
756
|
+
});
|
|
757
|
+
}
|
|
745
758
|
config = _defu2.default.call(void 0, _nullishCoalesce(result2.config, () => ( {})), _nullishCoalesce(config, () => ( {})));
|
|
746
759
|
}
|
|
747
760
|
}
|
|
@@ -814,7 +827,8 @@ var getConfigEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, () => {
|
|
|
814
827
|
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`] || void 0,
|
|
815
828
|
container: process.env[`${prefix}REGISTRY_CONTAINER`] || void 0
|
|
816
829
|
},
|
|
817
|
-
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ? getLogLevelLabel(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) : process.env[`${prefix}LOG_LEVEL`] : void 0
|
|
830
|
+
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ? getLogLevelLabel(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) : process.env[`${prefix}LOG_LEVEL`] : void 0,
|
|
831
|
+
skipConfigLogging: process.env[`${prefix}SKIP_CONFIG_LOGGING`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CONFIG_LOGGING`]) : void 0
|
|
818
832
|
};
|
|
819
833
|
const themeNames = Object.keys(process.env).filter((envKey) => envKey.startsWith(`${prefix}COLOR_`) && COLOR_KEYS.every((colorKey) => !envKey.startsWith(`${prefix}COLOR_LIGHT_${colorKey}`) && !envKey.startsWith(`${prefix}COLOR_DARK_${colorKey}`)));
|
|
820
834
|
config.colors = themeNames.length > 0 ? themeNames.reduce((ret, themeName) => {
|
|
@@ -1049,6 +1063,9 @@ var setConfigEnv = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, (config)
|
|
|
1049
1063
|
process.env.NX_VERBOSE_LOGGING = String(getLogLevel(config.logLevel) >= LogLevel.DEBUG ? true : false);
|
|
1050
1064
|
process.env.RUST_BACKTRACE = getLogLevel(config.logLevel) >= LogLevel.DEBUG ? "full" : "none";
|
|
1051
1065
|
}
|
|
1066
|
+
if (config.skipConfigLogging !== void 0) {
|
|
1067
|
+
process.env[`${prefix}SKIP_CONFIG_LOGGING`] = String(config.skipConfigLogging);
|
|
1068
|
+
}
|
|
1052
1069
|
process.env[`${prefix}CONFIG`] = JSON.stringify(config);
|
|
1053
1070
|
for (const key of Object.keys(_nullishCoalesce(config.extensions, () => ( {})))) {
|
|
1054
1071
|
config.extensions[key] && Object.keys(config.extensions[key]) && setExtensionEnv(key, config.extensions[key]);
|
|
@@ -1166,7 +1183,7 @@ var createStormConfig = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, asy
|
|
|
1166
1183
|
const defaultConfig = await getDefaultConfig(_workspaceRoot);
|
|
1167
1184
|
const configFile = await getConfigFile(_workspaceRoot);
|
|
1168
1185
|
if (!configFile && !skipLogs) {
|
|
1169
|
-
writeWarning("No Storm
|
|
1186
|
+
writeWarning("No Storm Workspace configuration file found in the current repository. Please ensure this is the expected behavior - you can add a `storm-workspace.json` file to the root of your workspace if it is not.\n", {
|
|
1170
1187
|
logLevel: "all"
|
|
1171
1188
|
});
|
|
1172
1189
|
}
|
|
@@ -1204,8 +1221,8 @@ var createConfigExtension = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0,
|
|
|
1204
1221
|
var loadStormConfig = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void 0, async (workspaceRoot, skipLogs = false) => {
|
|
1205
1222
|
const config = await createStormConfig(void 0, void 0, workspaceRoot, skipLogs);
|
|
1206
1223
|
setConfigEnv(config);
|
|
1207
|
-
if (!skipLogs) {
|
|
1208
|
-
writeTrace(`\u2699\uFE0F Using Storm configuration:
|
|
1224
|
+
if (!skipLogs && !config.skipConfigLogging) {
|
|
1225
|
+
writeTrace(`\u2699\uFE0F Using Storm Workspace configuration:
|
|
1209
1226
|
${formatLogMessage(config)}`, config);
|
|
1210
1227
|
}
|
|
1211
1228
|
return config;
|
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
var _chunkIOT45LXVjs = require('./chunk-IOT45LXV.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _chunkCHM4YATCjs = require('./chunk-CHM4YATC.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _chunk3LDSSIYNjs = require('./chunk-3LDSSIYN.js');
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
@@ -59,7 +59,7 @@ var applyWorkspaceExecutorTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(
|
|
|
59
59
|
result = result.replaceAll("{sourceRoot}", sourceRoot);
|
|
60
60
|
}
|
|
61
61
|
if (result.includes("{workspaceRoot}")) {
|
|
62
|
-
result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(tokenizerOptions.workspaceRoot, () => (
|
|
62
|
+
result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(tokenizerOptions.workspaceRoot, () => ( _chunk3LDSSIYNjs.findWorkspaceRoot.call(void 0, ))));
|
|
63
63
|
}
|
|
64
64
|
return result;
|
|
65
65
|
}, "applyWorkspaceExecutorTokens");
|
|
@@ -72,8 +72,8 @@ async function* publishExecutor(options, context) {
|
|
|
72
72
|
throw new Error("The executor requires a projectName.");
|
|
73
73
|
}
|
|
74
74
|
console.info(`\u{1F680} Running Storm Container Registry Publish executor on the ${context.projectName} crate`);
|
|
75
|
-
const workspaceRoot =
|
|
76
|
-
const config = await
|
|
75
|
+
const workspaceRoot = _chunk3LDSSIYNjs.findWorkspaceRoot.call(void 0, );
|
|
76
|
+
const config = await _chunk3LDSSIYNjs.getConfig.call(void 0, workspaceRoot);
|
|
77
77
|
const projectConfig = _optionalChain([context, 'access', _2 => _2.projectsConfigurations, 'optionalAccess', _3 => _3.projects, 'access', _4 => _4[context.projectName]]);
|
|
78
78
|
if (!projectConfig) {
|
|
79
79
|
throw new Error(`The executor requires a valid projectsConfiguration - No configuration found for project ${context.projectName}`);
|
|
@@ -82,7 +82,7 @@ async function* publishExecutor(options, context) {
|
|
|
82
82
|
const sourceRoot = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _6 => _6.sourceRoot]), () => ( workspaceRoot));
|
|
83
83
|
const projectName = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _7 => _7.name]), () => ( context.projectName));
|
|
84
84
|
config.workspaceRoot = workspaceRoot;
|
|
85
|
-
const tokenized = await
|
|
85
|
+
const tokenized = await _chunkCHM4YATCjs.applyWorkspaceTokens.call(void 0, options, {
|
|
86
86
|
config,
|
|
87
87
|
workspaceRoot,
|
|
88
88
|
projectRoot,
|
|
@@ -1,9 +1,9 @@
|
|
|
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 _chunkQPLVLMOVjs = require('./chunk-QPLVLMOV.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _chunk3LDSSIYNjs = require('./chunk-3LDSSIYN.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
@@ -12,7 +12,7 @@ var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
|
12
12
|
var _devkit = require('@nx/devkit');
|
|
13
13
|
var _path = require('path');
|
|
14
14
|
async function helmChartGeneratorFn(tree, options, config) {
|
|
15
|
-
|
|
15
|
+
_chunk3LDSSIYNjs.writeDebug.call(void 0, "\u{1F4DD} Preparing to write Helm Chart", config);
|
|
16
16
|
const project = _devkit.readProjectConfiguration.call(void 0, tree, options.project);
|
|
17
17
|
if (_optionalChain([project, 'access', _ => _.targets, 'optionalAccess', _2 => _2["helm-package"]])) {
|
|
18
18
|
throw new Error(`Project ${options.project} already has a helm target. Please remove it before running this command.`);
|
|
@@ -49,7 +49,7 @@ async function helmChartGeneratorFn(tree, options, config) {
|
|
|
49
49
|
};
|
|
50
50
|
}
|
|
51
51
|
_chunk3GQAWCBQjs.__name.call(void 0, helmChartGeneratorFn, "helmChartGeneratorFn");
|
|
52
|
-
var generator_default =
|
|
52
|
+
var generator_default = _chunkQPLVLMOVjs.withRunGenerator.call(void 0, "Helm Chart", helmChartGeneratorFn);
|
|
53
53
|
|
|
54
54
|
|
|
55
55
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
applyWorkspaceBaseTokens,
|
|
3
3
|
applyWorkspaceTokens
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-7GT66TVR.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-KM4H3E6A.mjs";
|
|
16
16
|
import {
|
|
17
17
|
__name
|
|
18
18
|
} from "./chunk-XUV4U54K.mjs";
|
|
@@ -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 _chunk3LDSSIYNjs = require('./chunk-3LDSSIYN.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
@@ -32,7 +32,7 @@ var applyWorkspaceBaseTokens = /* @__PURE__ */ _chunk3GQAWCBQjs.__name.call(void
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
if (result.includes("{workspaceRoot}")) {
|
|
35
|
-
result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _2 => _2.config, 'optionalAccess', _3 => _3.workspaceRoot]))), () => (
|
|
35
|
+
result = result.replaceAll("{workspaceRoot}", _nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _2 => _2.config, 'optionalAccess', _3 => _3.workspaceRoot]))), () => ( _chunk3LDSSIYNjs.findWorkspaceRoot.call(void 0, ))));
|
|
36
36
|
}
|
|
37
37
|
return result;
|
|
38
38
|
}, "applyWorkspaceBaseTokens");
|
|
@@ -8,7 +8,7 @@ var _chunkIOT45LXVjs = require('./chunk-IOT45LXV.js');
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _chunk3LDSSIYNjs = require('./chunk-3LDSSIYN.js');
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
var _chunk3GQAWCBQjs = require('./chunk-3GQAWCBQ.js');
|
|
@@ -35,8 +35,8 @@ var createNodes = [
|
|
|
35
35
|
if (_optionalChain([projectJson, 'optionalAccess', _2 => _2.name])) {
|
|
36
36
|
return {};
|
|
37
37
|
}
|
|
38
|
-
const workspaceRoot =
|
|
39
|
-
const config = await
|
|
38
|
+
const workspaceRoot = _chunk3LDSSIYNjs.findWorkspaceRoot.call(void 0, );
|
|
39
|
+
const config = await _chunk3LDSSIYNjs.getConfig.call(void 0, workspaceRoot);
|
|
40
40
|
Object.keys(projectJson).forEach((key) => {
|
|
41
41
|
if (!project[key]) {
|
|
42
42
|
project[key] = projectJson[key];
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
applyWorkspaceProjectTokens,
|
|
3
3
|
applyWorkspaceTokens
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-7GT66TVR.mjs";
|
|
5
5
|
import {
|
|
6
6
|
findWorkspaceRoot,
|
|
7
7
|
formatLogMessage,
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
writeSuccess,
|
|
15
15
|
writeTrace,
|
|
16
16
|
writeWarning
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-KM4H3E6A.mjs";
|
|
18
18
|
import {
|
|
19
19
|
createHelmClient
|
|
20
20
|
} from "./chunk-6V45YKVB.mjs";
|