@storm-software/k8s-tools 0.11.0 → 0.17.1

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.
Files changed (9) hide show
  1. package/CHANGELOG.md +56 -0
  2. package/index.js +14 -12
  3. package/meta.json +101 -81
  4. package/package.json +1 -84
  5. package/src/executors/container-publish/executor.js +4 -4
  6. package/src/executors/helm-package/executor.js +2 -12
  7. package/src/generators/helm-chart/generator.js +2 -12
  8. package/src/generators/helm-dependency/generator.js +2 -12
  9. package/src/plugins/docker/index.js +4 -13
package/CHANGELOG.md CHANGED
@@ -1,3 +1,59 @@
1
+ ## 0.17.1 (2025-01-09)
2
+
3
+ ### Bug Fixes
4
+
5
+ - **workspace-tools:** Added additional troubleshooting logging to the package
6
+ ([c2cbdcc5](https://github.com/storm-software/storm-ops/commit/c2cbdcc5))
7
+
8
+ ## 0.17.0 (2025-01-08)
9
+
10
+ ### Features
11
+
12
+ - **build-tools:** Enhanced build options resolving to allow plugin list
13
+ overrides
14
+ ([94aa9ac4](https://github.com/storm-software/storm-ops/commit/94aa9ac4))
15
+
16
+ ## 0.16.0 (2025-01-02)
17
+
18
+ ### Features
19
+
20
+ - **storm-ops:** Updated catalog and JSON schema for `StormConfig` object
21
+ ([bf99f680](https://github.com/storm-software/storm-ops/commit/bf99f680))
22
+
23
+ ## 0.15.0 (2025-01-02)
24
+
25
+ ### Features
26
+
27
+ - **k8s-tools:** Removed old dynamic modules import
28
+ ([81805110](https://github.com/storm-software/storm-ops/commit/81805110))
29
+
30
+ ## 0.14.0 (2025-01-02)
31
+
32
+ ### Features
33
+
34
+ - **config:** Regenerate the `storm.schema.json` file
35
+ ([258c3213](https://github.com/storm-software/storm-ops/commit/258c3213))
36
+
37
+ ## 0.13.0 (2024-12-30)
38
+
39
+ ### Features
40
+
41
+ - **storm-ops:** Completed enhancement around `catalog` and `workspace`
42
+ dependency upgrades
43
+ ([5dd13247](https://github.com/storm-software/storm-ops/commit/5dd13247))
44
+
45
+ ### Dependency Upgrades
46
+
47
+ - **storm-ops:** Added consistent `@types/node` versions across repository
48
+ ([a569536d](https://github.com/storm-software/storm-ops/commit/a569536d))
49
+
50
+ ## 0.12.0 (2024-12-22)
51
+
52
+ ### Features
53
+
54
+ - **esbuild:** Move shared code to `build-tools` package
55
+ ([bef9364e](https://github.com/storm-software/storm-ops/commit/bef9364e))
56
+
1
57
  ## 0.11.0 (2024-12-18)
2
58
 
3
59
  ### Features
package/index.js CHANGED
@@ -35,8 +35,8 @@ var __decorateClass = (decorators, target, key, kind) => {
35
35
  };
36
36
 
37
37
  // packages/k8s-tools/index.ts
38
- var k8s_tools_exports = {};
39
- __export(k8s_tools_exports, {
38
+ var index_exports = {};
39
+ __export(index_exports, {
40
40
  createDependencies: () => createDependencies,
41
41
  createNodes: () => createNodes,
42
42
  description: () => description,
@@ -46,10 +46,11 @@ __export(k8s_tools_exports, {
46
46
  name: () => name,
47
47
  serveExecutor: () => serveExecutor
48
48
  });
49
- module.exports = __toCommonJS(k8s_tools_exports);
49
+ module.exports = __toCommonJS(index_exports);
50
50
 
51
51
  // packages/k8s-tools/src/executors/container-publish/executor.ts
52
52
  var import_devkit = require("@nx/devkit");
53
+ var import_config_tools = require("@storm-software/config-tools");
53
54
  var import_apply_workspace_tokens = require("@storm-software/workspace-tools/utils/apply-workspace-tokens");
54
55
  var import_package_helpers = require("@storm-software/workspace-tools/utils/package-helpers");
55
56
  var import_node_https = __toESM(require("node:https"));
@@ -106,6 +107,7 @@ var getRegistryVersion = (name2, config) => {
106
107
  };
107
108
 
108
109
  // packages/k8s-tools/src/executors/helm-package/executor.ts
110
+ var import_console = require("@storm-software/config-tools/logger/console");
109
111
  var import_base_executor = require("@storm-software/workspace-tools/base/base-executor");
110
112
 
111
113
  // packages/k8s-tools/src/utils/client.ts
@@ -262,7 +264,6 @@ var createHelmClient = () => {
262
264
 
263
265
  // packages/k8s-tools/src/executors/helm-package/executor.ts
264
266
  async function serveExecutor(options, context, config) {
265
- const { writeWarning } = await import("@storm-software/config-tools");
266
267
  if (!context?.projectName || !context?.projectsConfigurations?.projects?.[context.projectName]?.root) {
267
268
  throw new Error("Nx executor context was invalid");
268
269
  }
@@ -292,7 +293,7 @@ async function serveExecutor(options, context, config) {
292
293
  remote: options.remote
293
294
  });
294
295
  } else {
295
- writeWarning(`Chart packaged at: ${chartPath}`, config);
296
+ (0, import_console.writeWarning)(`Chart packaged at: ${chartPath}`, config);
296
297
  }
297
298
  return {
298
299
  success: true
@@ -314,11 +315,11 @@ var executor_default = (0, import_base_executor.withRunExecutor)(
314
315
 
315
316
  // packages/k8s-tools/src/generators/helm-chart/generator.ts
316
317
  var import_devkit2 = require("@nx/devkit");
318
+ var import_console2 = require("@storm-software/config-tools/logger/console");
317
319
  var import_base_generator = require("@storm-software/workspace-tools/base/base-generator");
318
320
  var import_path = require("path");
319
321
  async function helmChartGeneratorFn(tree, options, config) {
320
- const { writeTrace } = await import("@storm-software/config-tools");
321
- writeTrace("\u{1F4DD} Preparing to write Helm Chart", config);
322
+ (0, import_console2.writeDebug)("\u{1F4DD} Preparing to write Helm Chart", config);
322
323
  const project = (0, import_devkit2.readProjectConfiguration)(tree, options.project);
323
324
  if (project.targets?.["helm-package"]) {
324
325
  throw new Error(
@@ -366,6 +367,7 @@ var generator_default = (0, import_base_generator.withRunGenerator)(
366
367
 
367
368
  // packages/k8s-tools/src/generators/helm-dependency/generator.ts
368
369
  var import_devkit3 = require("@nx/devkit");
370
+ var import_config_tools2 = require("@storm-software/config-tools");
369
371
  var import_base_generator2 = require("@storm-software/workspace-tools/base/base-generator");
370
372
 
371
373
  // node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs
@@ -2992,8 +2994,7 @@ var js_yaml_default = jsYaml;
2992
2994
 
2993
2995
  // packages/k8s-tools/src/generators/helm-dependency/generator.ts
2994
2996
  async function helmDependencyGeneratorFn(tree, options, config) {
2995
- const { writeTrace } = await import("@storm-software/config-tools");
2996
- writeTrace("\u{1F4DD} Preparing to add Helm Dependency", config);
2997
+ (0, import_config_tools2.writeDebug)("\u{1F4DD} Preparing to add Helm Dependency", config);
2997
2998
  const project = (0, import_devkit3.readProjectConfiguration)(tree, options.project);
2998
2999
  if (!project.targets?.["helm-package"]) {
2999
3000
  throw new Error(
@@ -3081,6 +3082,8 @@ function updateChartYaml(tree, project, name2, version, repository) {
3081
3082
 
3082
3083
  // packages/k8s-tools/src/plugins/docker/_dockerfile.ts
3083
3084
  var import_devkit4 = require("@nx/devkit");
3085
+ var import_create_storm_config = require("@storm-software/config-tools/create-storm-config");
3086
+ var import_find_workspace_root = require("@storm-software/config-tools/utilities/find-workspace-root");
3084
3087
  var import_package_helpers2 = require("@storm-software/workspace-tools/utils/package-helpers");
3085
3088
  var import_project_tags = require("@storm-software/workspace-tools/utils/project-tags");
3086
3089
  var import_node_fs = require("node:fs");
@@ -3094,7 +3097,6 @@ var createNodes = [
3094
3097
  if (!dockerFilePath) {
3095
3098
  return {};
3096
3099
  }
3097
- const { loadStormConfig, findWorkspaceRoot } = await import("@storm-software/config-tools");
3098
3100
  const root = dockerFilePath.substring(dockerFilePath.lastIndexOf("/") + 1);
3099
3101
  const projectJsonPath = (0, import_devkit4.joinPathFragments)(root, "project.json");
3100
3102
  if (!(0, import_node_fs.existsSync)(projectJsonPath)) {
@@ -3104,8 +3106,8 @@ var createNodes = [
3104
3106
  if (projectJson?.name) {
3105
3107
  return {};
3106
3108
  }
3107
- const workspaceRoot = findWorkspaceRoot();
3108
- const config = await loadStormConfig(workspaceRoot);
3109
+ const workspaceRoot = (0, import_find_workspace_root.findWorkspaceRoot)();
3110
+ const config = await (0, import_create_storm_config.loadStormConfig)(workspaceRoot);
3109
3111
  Object.keys(projectJson).forEach((key) => {
3110
3112
  if (!project[key]) {
3111
3113
  project[key] = projectJson[key];
package/meta.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "inputs": {
3
3
  "packages/k8s-tools/src/executors/container-publish/executor.ts": {
4
- "bytes": 6726,
4
+ "bytes": 6670,
5
5
  "imports": [
6
6
  {
7
7
  "path": "@nx/devkit",
@@ -13,6 +13,11 @@
13
13
  "kind": "import-statement",
14
14
  "external": true
15
15
  },
16
+ {
17
+ "path": "@storm-software/config-tools",
18
+ "kind": "import-statement",
19
+ "external": true
20
+ },
16
21
  {
17
22
  "path": "@storm-software/workspace-tools/utils/apply-workspace-tokens",
18
23
  "kind": "import-statement",
@@ -32,11 +37,6 @@
32
37
  "path": "node:https",
33
38
  "kind": "import-statement",
34
39
  "external": true
35
- },
36
- {
37
- "path": "@storm-software/config-tools",
38
- "kind": "dynamic-import",
39
- "external": true
40
40
  }
41
41
  ],
42
42
  "format": "esm"
@@ -90,8 +90,13 @@
90
90
  "format": "esm"
91
91
  },
92
92
  "packages/k8s-tools/src/executors/helm-package/executor.ts": {
93
- "bytes": 1977,
93
+ "bytes": 1979,
94
94
  "imports": [
95
+ {
96
+ "path": "@storm-software/config-tools/logger/console",
97
+ "kind": "import-statement",
98
+ "external": true
99
+ },
95
100
  {
96
101
  "path": "@storm-software/workspace-tools/base/base-executor",
97
102
  "kind": "import-statement",
@@ -106,11 +111,6 @@
106
111
  "path": "./schema",
107
112
  "kind": "import-statement",
108
113
  "external": true
109
- },
110
- {
111
- "path": "@storm-software/config-tools",
112
- "kind": "dynamic-import",
113
- "external": true
114
114
  }
115
115
  ],
116
116
  "format": "esm"
@@ -132,7 +132,7 @@
132
132
  "format": "esm"
133
133
  },
134
134
  "packages/k8s-tools/src/generators/helm-chart/generator.ts": {
135
- "bytes": 1814,
135
+ "bytes": 1816,
136
136
  "imports": [
137
137
  {
138
138
  "path": "@nx/devkit",
@@ -145,18 +145,18 @@
145
145
  "external": true
146
146
  },
147
147
  {
148
- "path": "@storm-software/workspace-tools/base/base-generator",
148
+ "path": "@storm-software/config-tools/logger/console",
149
149
  "kind": "import-statement",
150
150
  "external": true
151
151
  },
152
152
  {
153
- "path": "path",
153
+ "path": "@storm-software/workspace-tools/base/base-generator",
154
154
  "kind": "import-statement",
155
155
  "external": true
156
156
  },
157
157
  {
158
- "path": "@storm-software/config-tools",
159
- "kind": "dynamic-import",
158
+ "path": "path",
159
+ "kind": "import-statement",
160
160
  "external": true
161
161
  }
162
162
  ],
@@ -168,7 +168,7 @@
168
168
  "format": "esm"
169
169
  },
170
170
  "packages/k8s-tools/src/generators/helm-dependency/generator.ts": {
171
- "bytes": 3414,
171
+ "bytes": 3401,
172
172
  "imports": [
173
173
  {
174
174
  "path": "@nx/devkit",
@@ -180,6 +180,11 @@
180
180
  "kind": "import-statement",
181
181
  "external": true
182
182
  },
183
+ {
184
+ "path": "@storm-software/config-tools",
185
+ "kind": "import-statement",
186
+ "external": true
187
+ },
183
188
  {
184
189
  "path": "@storm-software/workspace-tools/base/base-generator",
185
190
  "kind": "import-statement",
@@ -189,11 +194,6 @@
189
194
  "path": "node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs",
190
195
  "kind": "import-statement",
191
196
  "original": "js-yaml"
192
- },
193
- {
194
- "path": "@storm-software/config-tools",
195
- "kind": "dynamic-import",
196
- "external": true
197
197
  }
198
198
  ],
199
199
  "format": "esm"
@@ -215,13 +215,23 @@
215
215
  "format": "esm"
216
216
  },
217
217
  "packages/k8s-tools/src/plugins/docker/_dockerfile.ts": {
218
- "bytes": 6662,
218
+ "bytes": 6732,
219
219
  "imports": [
220
220
  {
221
221
  "path": "@nx/devkit",
222
222
  "kind": "import-statement",
223
223
  "external": true
224
224
  },
225
+ {
226
+ "path": "@storm-software/config-tools/create-storm-config",
227
+ "kind": "import-statement",
228
+ "external": true
229
+ },
230
+ {
231
+ "path": "@storm-software/config-tools/utilities/find-workspace-root",
232
+ "kind": "import-statement",
233
+ "external": true
234
+ },
225
235
  {
226
236
  "path": "@storm-software/workspace-tools/utils/package-helpers",
227
237
  "kind": "import-statement",
@@ -241,11 +251,6 @@
241
251
  "path": "node:fs",
242
252
  "kind": "import-statement",
243
253
  "external": true
244
- },
245
- {
246
- "path": "@storm-software/config-tools",
247
- "kind": "dynamic-import",
248
- "external": true
249
254
  }
250
255
  ],
251
256
  "format": "esm"
@@ -313,6 +318,11 @@
313
318
  "kind": "require-call",
314
319
  "external": true
315
320
  },
321
+ {
322
+ "path": "@storm-software/config-tools",
323
+ "kind": "require-call",
324
+ "external": true
325
+ },
316
326
  {
317
327
  "path": "@storm-software/workspace-tools/utils/apply-workspace-tokens",
318
328
  "kind": "require-call",
@@ -328,6 +338,11 @@
328
338
  "kind": "require-call",
329
339
  "external": true
330
340
  },
341
+ {
342
+ "path": "@storm-software/config-tools/logger/console",
343
+ "kind": "require-call",
344
+ "external": true
345
+ },
331
346
  {
332
347
  "path": "@storm-software/workspace-tools/base/base-executor",
333
348
  "kind": "require-call",
@@ -339,12 +354,12 @@
339
354
  "external": true
340
355
  },
341
356
  {
342
- "path": "@storm-software/config-tools",
343
- "kind": "dynamic-import",
357
+ "path": "@nx/devkit",
358
+ "kind": "require-call",
344
359
  "external": true
345
360
  },
346
361
  {
347
- "path": "@nx/devkit",
362
+ "path": "@storm-software/config-tools/logger/console",
348
363
  "kind": "require-call",
349
364
  "external": true
350
365
  },
@@ -359,12 +374,12 @@
359
374
  "external": true
360
375
  },
361
376
  {
362
- "path": "@storm-software/config-tools",
363
- "kind": "dynamic-import",
377
+ "path": "@nx/devkit",
378
+ "kind": "require-call",
364
379
  "external": true
365
380
  },
366
381
  {
367
- "path": "@nx/devkit",
382
+ "path": "@storm-software/config-tools",
368
383
  "kind": "require-call",
369
384
  "external": true
370
385
  },
@@ -374,33 +389,33 @@
374
389
  "external": true
375
390
  },
376
391
  {
377
- "path": "@storm-software/config-tools",
378
- "kind": "dynamic-import",
392
+ "path": "@nx/devkit",
393
+ "kind": "require-call",
379
394
  "external": true
380
395
  },
381
396
  {
382
- "path": "@nx/devkit",
397
+ "path": "@storm-software/config-tools/create-storm-config",
383
398
  "kind": "require-call",
384
399
  "external": true
385
400
  },
386
401
  {
387
- "path": "@storm-software/workspace-tools/utils/package-helpers",
402
+ "path": "@storm-software/config-tools/utilities/find-workspace-root",
388
403
  "kind": "require-call",
389
404
  "external": true
390
405
  },
391
406
  {
392
- "path": "@storm-software/workspace-tools/utils/project-tags",
407
+ "path": "@storm-software/workspace-tools/utils/package-helpers",
393
408
  "kind": "require-call",
394
409
  "external": true
395
410
  },
396
411
  {
397
- "path": "node:fs",
412
+ "path": "@storm-software/workspace-tools/utils/project-tags",
398
413
  "kind": "require-call",
399
414
  "external": true
400
415
  },
401
416
  {
402
- "path": "@storm-software/config-tools",
403
- "kind": "dynamic-import",
417
+ "path": "node:fs",
418
+ "kind": "require-call",
404
419
  "external": true
405
420
  }
406
421
  ],
@@ -408,16 +423,16 @@
408
423
  "entryPoint": "packages/k8s-tools/index.ts",
409
424
  "inputs": {
410
425
  "packages/k8s-tools/index.ts": {
411
- "bytesInOutput": 447
426
+ "bytesInOutput": 435
412
427
  },
413
428
  "packages/k8s-tools/src/executors/container-publish/executor.ts": {
414
- "bytesInOutput": 2030
429
+ "bytesInOutput": 2097
415
430
  },
416
431
  "packages/k8s-tools/src/executors/index.ts": {
417
432
  "bytesInOutput": 0
418
433
  },
419
434
  "packages/k8s-tools/src/executors/helm-package/executor.ts": {
420
- "bytesInOutput": 1555
435
+ "bytesInOutput": 1579
421
436
  },
422
437
  "packages/k8s-tools/src/utils/client.ts": {
423
438
  "bytesInOutput": 3290
@@ -432,19 +447,19 @@
432
447
  "bytesInOutput": 0
433
448
  },
434
449
  "packages/k8s-tools/src/generators/helm-chart/generator.ts": {
435
- "bytesInOutput": 1689
450
+ "bytesInOutput": 1717
436
451
  },
437
452
  "packages/k8s-tools/src/generators/index.ts": {
438
453
  "bytesInOutput": 0
439
454
  },
440
455
  "packages/k8s-tools/src/generators/helm-dependency/generator.ts": {
441
- "bytesInOutput": 2873
456
+ "bytesInOutput": 2896
442
457
  },
443
458
  "node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs": {
444
459
  "bytesInOutput": 88006
445
460
  },
446
461
  "packages/k8s-tools/src/plugins/docker/_dockerfile.ts": {
447
- "bytesInOutput": 5874
462
+ "bytesInOutput": 6039
448
463
  },
449
464
  "packages/k8s-tools/src/plugins/docker/index.ts": {
450
465
  "bytesInOutput": 0
@@ -453,23 +468,23 @@
453
468
  "bytesInOutput": 0
454
469
  }
455
470
  },
456
- "bytes": 109385
471
+ "bytes": 109680
457
472
  },
458
473
  "dist/packages/k8s-tools/src/executors/helm-package/executor.js": {
459
474
  "imports": [
460
475
  {
461
- "path": "@storm-software/workspace-tools/base/base-executor",
476
+ "path": "@storm-software/config-tools/logger/console",
462
477
  "kind": "require-call",
463
478
  "external": true
464
479
  },
465
480
  {
466
- "path": "node:child_process",
481
+ "path": "@storm-software/workspace-tools/base/base-executor",
467
482
  "kind": "require-call",
468
483
  "external": true
469
484
  },
470
485
  {
471
- "path": "@storm-software/config-tools",
472
- "kind": "dynamic-import",
486
+ "path": "node:child_process",
487
+ "kind": "require-call",
473
488
  "external": true
474
489
  }
475
490
  ],
@@ -477,7 +492,7 @@
477
492
  "entryPoint": "packages/k8s-tools/src/executors/helm-package/executor.ts",
478
493
  "inputs": {
479
494
  "packages/k8s-tools/src/executors/helm-package/executor.ts": {
480
- "bytesInOutput": 1736
495
+ "bytesInOutput": 1760
481
496
  },
482
497
  "packages/k8s-tools/src/utils/client.ts": {
483
498
  "bytesInOutput": 3288
@@ -489,7 +504,7 @@
489
504
  "bytesInOutput": 579
490
505
  }
491
506
  },
492
- "bytes": 7947
507
+ "bytes": 7374
493
508
  },
494
509
  "dist/packages/k8s-tools/src/executors/container-publish/executor.js": {
495
510
  "imports": [
@@ -499,23 +514,23 @@
499
514
  "external": true
500
515
  },
501
516
  {
502
- "path": "@storm-software/workspace-tools/utils/apply-workspace-tokens",
517
+ "path": "@storm-software/config-tools",
503
518
  "kind": "require-call",
504
519
  "external": true
505
520
  },
506
521
  {
507
- "path": "@storm-software/workspace-tools/utils/package-helpers",
522
+ "path": "@storm-software/workspace-tools/utils/apply-workspace-tokens",
508
523
  "kind": "require-call",
509
524
  "external": true
510
525
  },
511
526
  {
512
- "path": "node:https",
527
+ "path": "@storm-software/workspace-tools/utils/package-helpers",
513
528
  "kind": "require-call",
514
529
  "external": true
515
530
  },
516
531
  {
517
- "path": "@storm-software/config-tools",
518
- "kind": "dynamic-import",
532
+ "path": "node:https",
533
+ "kind": "require-call",
519
534
  "external": true
520
535
  }
521
536
  ],
@@ -523,10 +538,10 @@
523
538
  "entryPoint": "packages/k8s-tools/src/executors/container-publish/executor.ts",
524
539
  "inputs": {
525
540
  "packages/k8s-tools/src/executors/container-publish/executor.ts": {
526
- "bytesInOutput": 5914
541
+ "bytesInOutput": 5939
527
542
  }
528
543
  },
529
- "bytes": 7475
544
+ "bytes": 7500
530
545
  },
531
546
  "dist/packages/k8s-tools/src/generators/helm-chart/generator.js": {
532
547
  "imports": [
@@ -536,18 +551,18 @@
536
551
  "external": true
537
552
  },
538
553
  {
539
- "path": "@storm-software/workspace-tools/base/base-generator",
554
+ "path": "@storm-software/config-tools/logger/console",
540
555
  "kind": "require-call",
541
556
  "external": true
542
557
  },
543
558
  {
544
- "path": "path",
559
+ "path": "@storm-software/workspace-tools/base/base-generator",
545
560
  "kind": "require-call",
546
561
  "external": true
547
562
  },
548
563
  {
549
- "path": "@storm-software/config-tools",
550
- "kind": "dynamic-import",
564
+ "path": "path",
565
+ "kind": "require-call",
551
566
  "external": true
552
567
  }
553
568
  ],
@@ -555,10 +570,10 @@
555
570
  "entryPoint": "packages/k8s-tools/src/generators/helm-chart/generator.ts",
556
571
  "inputs": {
557
572
  "packages/k8s-tools/src/generators/helm-chart/generator.ts": {
558
- "bytesInOutput": 1883
573
+ "bytesInOutput": 1909
559
574
  }
560
575
  },
561
- "bytes": 3441
576
+ "bytes": 2870
562
577
  },
563
578
  "dist/packages/k8s-tools/src/generators/helm-dependency/generator.js": {
564
579
  "imports": [
@@ -568,13 +583,13 @@
568
583
  "external": true
569
584
  },
570
585
  {
571
- "path": "@storm-software/workspace-tools/base/base-generator",
586
+ "path": "@storm-software/config-tools",
572
587
  "kind": "require-call",
573
588
  "external": true
574
589
  },
575
590
  {
576
- "path": "@storm-software/config-tools",
577
- "kind": "dynamic-import",
591
+ "path": "@storm-software/workspace-tools/base/base-generator",
592
+ "kind": "require-call",
578
593
  "external": true
579
594
  }
580
595
  ],
@@ -582,13 +597,13 @@
582
597
  "entryPoint": "packages/k8s-tools/src/generators/helm-dependency/generator.ts",
583
598
  "inputs": {
584
599
  "packages/k8s-tools/src/generators/helm-dependency/generator.ts": {
585
- "bytesInOutput": 3051
600
+ "bytesInOutput": 3072
586
601
  },
587
602
  "node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs": {
588
603
  "bytesInOutput": 87999
589
604
  }
590
605
  },
591
- "bytes": 92893
606
+ "bytes": 92317
592
607
  },
593
608
  "dist/packages/k8s-tools/src/plugins/docker/index.js": {
594
609
  "imports": [
@@ -598,23 +613,28 @@
598
613
  "external": true
599
614
  },
600
615
  {
601
- "path": "@storm-software/workspace-tools/utils/package-helpers",
616
+ "path": "@storm-software/config-tools/create-storm-config",
602
617
  "kind": "require-call",
603
618
  "external": true
604
619
  },
605
620
  {
606
- "path": "@storm-software/workspace-tools/utils/project-tags",
621
+ "path": "@storm-software/config-tools/utilities/find-workspace-root",
607
622
  "kind": "require-call",
608
623
  "external": true
609
624
  },
610
625
  {
611
- "path": "node:fs",
626
+ "path": "@storm-software/workspace-tools/utils/package-helpers",
612
627
  "kind": "require-call",
613
628
  "external": true
614
629
  },
615
630
  {
616
- "path": "@storm-software/config-tools",
617
- "kind": "dynamic-import",
631
+ "path": "@storm-software/workspace-tools/utils/project-tags",
632
+ "kind": "require-call",
633
+ "external": true
634
+ },
635
+ {
636
+ "path": "node:fs",
637
+ "kind": "require-call",
618
638
  "external": true
619
639
  }
620
640
  ],
@@ -625,10 +645,10 @@
625
645
  "bytesInOutput": 238
626
646
  },
627
647
  "packages/k8s-tools/src/plugins/docker/_dockerfile.ts": {
628
- "bytesInOutput": 5869
648
+ "bytesInOutput": 6034
629
649
  }
630
650
  },
631
- "bytes": 7750
651
+ "bytes": 7318
632
652
  }
633
653
  }
634
654
  }
package/package.json CHANGED
@@ -1,84 +1 @@
1
- {
2
- "name": "@storm-software/k8s-tools",
3
- "version": "0.11.0",
4
- "type": "commonjs",
5
- "description": "Tools for managing Kubernetes (k8s) infrastructure within a Nx workspace.",
6
- "repository": {
7
- "type": "github",
8
- "url": "https://github.com/storm-software/storm-ops",
9
- "directory": "packages/k8s-tools"
10
- },
11
- "homepage": "https://stormsoftware.com",
12
- "bugs": {
13
- "url": "https://github.com/storm-software/storm-ops/issues",
14
- "email": "support@stormsoftware.com"
15
- },
16
- "author": {
17
- "name": "Storm Software",
18
- "email": "contact@stormsoftware.com",
19
- "url": "https://stormsoftware.com"
20
- },
21
- "license": "Apache-2.0",
22
- "private": false,
23
- "main": "./index.js",
24
- "exports": {
25
- ".": "./index.js",
26
- "./package.json": "./package.json",
27
- "./generators.json": "./generators.json",
28
- "./generators/*/schema.json": "./src/generators/*/schema.json",
29
- "./executors.json": "./executors.json",
30
- "./executors/*/schema.json": "./src/executors/*/schema.json",
31
- "./plugins/docker": "./src/plugins/docker/index.js"
32
- },
33
- "typings": "./declarations.d.ts",
34
- "keywords": [
35
- "storm",
36
- "storm-ops",
37
- "kubernetes",
38
- "k8s",
39
- "helm",
40
- "storm-stack",
41
- "sullivanpj",
42
- "monorepo"
43
- ],
44
- "peerDependencies": {
45
- "@nx-tools/container-metadata": "^6.0.2",
46
- "@nx-tools/nx-container": "^6.0.2",
47
- "@nx/devkit": "^20.2.2",
48
- "@nx/workspace": "^20.2.2",
49
- "nx": "^20.2.2"
50
- },
51
- "peerDependenciesMeta": {
52
- "@nx-tools/container-metadata": {
53
- "optional": false
54
- },
55
- "@nx-tools/nx-container": {
56
- "optional": false
57
- },
58
- "@nx/devkit": {
59
- "optional": false
60
- },
61
- "@nx/workspace": {
62
- "optional": false
63
- },
64
- "nx": {
65
- "optional": false
66
- }
67
- },
68
- "dependencies": {
69
- "js-yaml": "^4.1.0"
70
- },
71
- "devDependencies": {
72
- "@nx-tools/container-metadata": "^6.0.2",
73
- "@nx-tools/nx-container": "^6.0.2",
74
- "@nx/devkit": "^20.2.2",
75
- "@nx/workspace": "^20.2.2",
76
- "@types/js-yaml": "4.0.9",
77
- "nx": "^20.2.2"
78
- },
79
- "publishConfig": {
80
- "access": "public"
81
- },
82
- "executors": "./executors.json",
83
- "generators": "./generators.json"
84
- }
1
+ {"name":"@storm-software/k8s-tools","version":"0.17.1","type":"commonjs","description":"Tools for managing Kubernetes (k8s) infrastructure within a Nx workspace.","repository":{"type":"github","url":"https://github.com/storm-software/storm-ops","directory":"packages/k8s-tools"},"homepage":"https://stormsoftware.com","bugs":"https://github.com/storm-software/storm-ops/issues","author":{"name":"Storm Software","email":"contact@stormsoftware.com","url":"https://stormsoftware.com"},"license":"Apache-2.0","private":false,"main":"./index.js","exports":{".":"./index.js","./package.json":"./package.json","./generators.json":"./generators.json","./generators/*/schema.json":"./src/generators/*/schema.json","./executors.json":"./executors.json","./executors/*/schema.json":"./src/executors/*/schema.json","./plugins/docker":"./src/plugins/docker/index.js"},"typings":"./declarations.d.ts","keywords":["helm","k8s","kubernetes","monorepo","storm","storm-ops","storm-stack","sullivanpj"],"peerDependencies":{"@nx-tools/container-metadata":"^6.0.2","@nx-tools/nx-container":"^6.0.2","@nx/devkit":"^20.3.1","@nx/workspace":"^20.3.1","nx":"^20.3.1"},"peerDependenciesMeta":{"@nx-tools/container-metadata":{"optional":false},"@nx-tools/nx-container":{"optional":false},"@nx/devkit":{"optional":false},"@nx/workspace":{"optional":false},"nx":{"optional":false}},"dependencies":{"js-yaml":"^4.1.0"},"devDependencies":{"@nx-tools/container-metadata":"^6.0.2","@nx-tools/nx-container":"^6.0.2","@nx/devkit":"^20.3.1","@nx/workspace":"^20.3.1","@types/js-yaml":"4.0.9","@types/node":"^22.10.2","nx":"^20.3.1"},"publishConfig":{"access":"public"},"executors":"./executors.json","generators":"./generators.json"}
package/src/executors/container-publish/executor.js CHANGED
@@ -34,11 +34,11 @@ __export(executor_exports, {
34
34
  });
35
35
  module.exports = __toCommonJS(executor_exports);
36
36
  var import_devkit = require("@nx/devkit");
37
+ var import_config_tools = require("@storm-software/config-tools");
37
38
  var import_apply_workspace_tokens = require("@storm-software/workspace-tools/utils/apply-workspace-tokens");
38
39
  var import_package_helpers = require("@storm-software/workspace-tools/utils/package-helpers");
39
40
  var import_node_https = __toESM(require("node:https"));
40
41
  async function* publishExecutor(options, context) {
41
- const { loadStormConfig, applyWorkspaceTokens, findWorkspaceRoot } = await import("@storm-software/config-tools");
42
42
  const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
43
43
  if (!context.projectName) {
44
44
  throw new Error("The executor requires a projectName.");
@@ -46,8 +46,8 @@ async function* publishExecutor(options, context) {
46
46
  console.info(
47
47
  `\u{1F680} Running Storm Container Registry Publish executor on the ${context.projectName} crate`
48
48
  );
49
- const workspaceRoot = findWorkspaceRoot();
50
- const config = await loadStormConfig(workspaceRoot);
49
+ const workspaceRoot = (0, import_config_tools.findWorkspaceRoot)();
50
+ const config = await (0, import_config_tools.loadStormConfig)(workspaceRoot);
51
51
  const projectConfig = context.projectsConfigurations?.projects[context.projectName];
52
52
  if (!projectConfig) {
53
53
  throw new Error(
@@ -58,7 +58,7 @@ async function* publishExecutor(options, context) {
58
58
  const sourceRoot = projectConfig?.sourceRoot ?? workspaceRoot;
59
59
  const projectName = projectConfig?.name ?? context.projectName;
60
60
  config.workspaceRoot = workspaceRoot;
61
- const tokenized = await applyWorkspaceTokens(
61
+ const tokenized = await (0, import_config_tools.applyWorkspaceTokens)(
62
62
  options,
63
63
  {
64
64
  config,
package/src/executors/helm-package/executor.js CHANGED
@@ -1,8 +1,6 @@
1
- var __create = Object.create;
2
1
  var __defProp = Object.defineProperty;
3
2
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
3
  var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
4
  var __hasOwnProp = Object.prototype.hasOwnProperty;
7
5
  var __export = (target, all) => {
8
6
  for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
16
14
  }
17
15
  return to;
18
16
  };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
18
  var __decorateClass = (decorators, target, key, kind) => {
29
19
  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
@@ -41,6 +31,7 @@ __export(executor_exports, {
41
31
  serveExecutor: () => serveExecutor
42
32
  });
43
33
  module.exports = __toCommonJS(executor_exports);
34
+ var import_console = require("@storm-software/config-tools/logger/console");
44
35
  var import_base_executor = require("@storm-software/workspace-tools/base/base-executor");
45
36
 
46
37
  // packages/k8s-tools/src/utils/client.ts
@@ -197,7 +188,6 @@ var createHelmClient = () => {
197
188
 
198
189
  // packages/k8s-tools/src/executors/helm-package/executor.ts
199
190
  async function serveExecutor(options, context, config) {
200
- const { writeWarning } = await import("@storm-software/config-tools");
201
191
  if (!context?.projectName || !context?.projectsConfigurations?.projects?.[context.projectName]?.root) {
202
192
  throw new Error("Nx executor context was invalid");
203
193
  }
@@ -227,7 +217,7 @@ async function serveExecutor(options, context, config) {
227
217
  remote: options.remote
228
218
  });
229
219
  } else {
230
- writeWarning(`Chart packaged at: ${chartPath}`, config);
220
+ (0, import_console.writeWarning)(`Chart packaged at: ${chartPath}`, config);
231
221
  }
232
222
  return {
233
223
  success: true
package/src/generators/helm-chart/generator.js CHANGED
@@ -1,8 +1,6 @@
1
- var __create = Object.create;
2
1
  var __defProp = Object.defineProperty;
3
2
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
3
  var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
4
  var __hasOwnProp = Object.prototype.hasOwnProperty;
7
5
  var __export = (target, all) => {
8
6
  for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
16
14
  }
17
15
  return to;
18
16
  };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
18
 
29
19
  // packages/k8s-tools/src/generators/helm-chart/generator.ts
@@ -34,11 +24,11 @@ __export(generator_exports, {
34
24
  });
35
25
  module.exports = __toCommonJS(generator_exports);
36
26
  var import_devkit = require("@nx/devkit");
27
+ var import_console = require("@storm-software/config-tools/logger/console");
37
28
  var import_base_generator = require("@storm-software/workspace-tools/base/base-generator");
38
29
  var import_path = require("path");
39
30
  async function helmChartGeneratorFn(tree, options, config) {
40
- const { writeTrace } = await import("@storm-software/config-tools");
41
- writeTrace("\u{1F4DD} Preparing to write Helm Chart", config);
31
+ (0, import_console.writeDebug)("\u{1F4DD} Preparing to write Helm Chart", config);
42
32
  const project = (0, import_devkit.readProjectConfiguration)(tree, options.project);
43
33
  if (project.targets?.["helm-package"]) {
44
34
  throw new Error(
package/src/generators/helm-dependency/generator.js CHANGED
@@ -1,8 +1,6 @@
1
- var __create = Object.create;
2
1
  var __defProp = Object.defineProperty;
3
2
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
3
  var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
4
  var __hasOwnProp = Object.prototype.hasOwnProperty;
7
5
  var __export = (target, all) => {
8
6
  for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
16
14
  }
17
15
  return to;
18
16
  };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
18
 
29
19
  // packages/k8s-tools/src/generators/helm-dependency/generator.ts
@@ -34,6 +24,7 @@ __export(generator_exports, {
34
24
  });
35
25
  module.exports = __toCommonJS(generator_exports);
36
26
  var import_devkit = require("@nx/devkit");
27
+ var import_config_tools = require("@storm-software/config-tools");
37
28
  var import_base_generator = require("@storm-software/workspace-tools/base/base-generator");
38
29
 
39
30
  // node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs
@@ -2660,8 +2651,7 @@ var js_yaml_default = jsYaml;
2660
2651
 
2661
2652
  // packages/k8s-tools/src/generators/helm-dependency/generator.ts
2662
2653
  async function helmDependencyGeneratorFn(tree, options, config) {
2663
- const { writeTrace } = await import("@storm-software/config-tools");
2664
- writeTrace("\u{1F4DD} Preparing to add Helm Dependency", config);
2654
+ (0, import_config_tools.writeDebug)("\u{1F4DD} Preparing to add Helm Dependency", config);
2665
2655
  const project = (0, import_devkit.readProjectConfiguration)(tree, options.project);
2666
2656
  if (!project.targets?.["helm-package"]) {
2667
2657
  throw new Error(
package/src/plugins/docker/index.js CHANGED
@@ -1,8 +1,6 @@
1
- var __create = Object.create;
2
1
  var __defProp = Object.defineProperty;
3
2
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
3
  var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
4
  var __hasOwnProp = Object.prototype.hasOwnProperty;
7
5
  var __export = (target, all) => {
8
6
  for (var name2 in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
16
14
  }
17
15
  return to;
18
16
  };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
18
 
29
19
  // packages/k8s-tools/src/plugins/docker/index.ts
@@ -38,6 +28,8 @@ module.exports = __toCommonJS(docker_exports);
38
28
 
39
29
  // packages/k8s-tools/src/plugins/docker/_dockerfile.ts
40
30
  var import_devkit = require("@nx/devkit");
31
+ var import_create_storm_config = require("@storm-software/config-tools/create-storm-config");
32
+ var import_find_workspace_root = require("@storm-software/config-tools/utilities/find-workspace-root");
41
33
  var import_package_helpers = require("@storm-software/workspace-tools/utils/package-helpers");
42
34
  var import_project_tags = require("@storm-software/workspace-tools/utils/project-tags");
43
35
  var import_node_fs = require("node:fs");
@@ -51,7 +43,6 @@ var createNodes = [
51
43
  if (!dockerFilePath) {
52
44
  return {};
53
45
  }
54
- const { loadStormConfig, findWorkspaceRoot } = await import("@storm-software/config-tools");
55
46
  const root = dockerFilePath.substring(dockerFilePath.lastIndexOf("/") + 1);
56
47
  const projectJsonPath = (0, import_devkit.joinPathFragments)(root, "project.json");
57
48
  if (!(0, import_node_fs.existsSync)(projectJsonPath)) {
@@ -61,8 +52,8 @@ var createNodes = [
61
52
  if (projectJson?.name) {
62
53
  return {};
63
54
  }
64
- const workspaceRoot = findWorkspaceRoot();
65
- const config = await loadStormConfig(workspaceRoot);
55
+ const workspaceRoot = (0, import_find_workspace_root.findWorkspaceRoot)();
56
+ const config = await (0, import_create_storm_config.loadStormConfig)(workspaceRoot);
66
57
  Object.keys(projectJson).forEach((key) => {
67
58
  if (!project[key]) {
68
59
  project[key] = projectJson[key];