@storm-software/k8s-tools 0.1.0 → 0.2.0

package/src/generators/helm-chart/generator.d.ts

@@ -1,5 +1,8 @@
-import { GeneratorCallback, Tree } from "@nx/devkit";
+import { Tree } from "@nx/devkit";
+import { StormConfig } from "@storm-software/config";
 import type { HelmChartGeneratorSchema } from "./schema";
-export declare function helmChartGenerator(tree: Tree, options: HelmChartGeneratorSchema): Promise<GeneratorCallback>;
-export default helmChartGenerator;
-export declare const helmChartSchematic: (generatorOptions: HelmChartGeneratorSchema) => (tree: any, context: any) => Promise<any>;
+export declare function helmChartGeneratorFn(tree: Tree, options: HelmChartGeneratorSchema, config?: StormConfig): Promise<{
+    success: boolean;
+}>;
+declare const _default: (tree: Tree, _options: HelmChartGeneratorSchema) => Promise<import("@nx/devkit").GeneratorCallback | import("packages/workspace-tools/declarations").BaseGeneratorResult>;
+export default _default;

package/src/generators/helm-chart/generator.js

@@ -30,102 +30,60 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var generator_exports = {};
 __export(generator_exports, {
   default: () => generator_default,
-  helmChartGenerator: () => helmChartGenerator,
-  helmChartSchematic: () => helmChartSchematic
+  helmChartGeneratorFn: () => helmChartGeneratorFn
 });
 module.exports = __toCommonJS(generator_exports);
 var import_devkit = require("@nx/devkit");
+var import_workspace_tools = require("@storm-software/workspace-tools");
 var import_path = require("path");
-async function helmChartGenerator(tree, options) {
-  const {
-    getStopwatch,
-    writeDebug,
-    writeError,
-    writeFatal,
-    writeInfo,
-    writeTrace,
-    findWorkspaceRoot,
-    loadStormConfig
-  } = await import("@storm-software/config-tools");
-  const stopwatch = getStopwatch("Storm Helm Chart generator");
-  let config;
-  try {
-    writeInfo(`\u26A1 Running the Storm Helm Chart generator...
-
-`, config);
-    const workspaceRoot = findWorkspaceRoot();
-    writeDebug(
-      `Loading the Storm Config from environment variables and storm.json file...
-- workspaceRoot: ${workspaceRoot}`,
-      config
-    );
-    config = await loadStormConfig(workspaceRoot);
-    writeTrace(
-      `Loaded Storm config into env: 
-${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
-      config
+async function helmChartGeneratorFn(tree, options, config) {
+  const { writeTrace } = await import("@storm-software/config-tools");
+  writeTrace("\u{1F4DD}  Preparing to write Helm Chart", config);
+  const project = (0, import_devkit.readProjectConfiguration)(tree, options.project);
+  if (project.targets?.["helm-package"]) {
+    throw new Error(
+      `Project ${options.project} already has a helm target. Please remove it before running this command.`
     );
-    const tasks = [];
-    tasks.push(async () => {
-      const project = (0, import_devkit.readProjectConfiguration)(tree, options.project);
-      if (project.targets?.["helm-package"]) {
-        throw new Error(
-          `Project ${options.project} already has a helm target. Please remove it before running this command.`
-        );
-      }
-      (0, import_devkit.updateProjectConfiguration)(tree, options.project, {
-        ...project,
-        targets: {
-          ...project.targets,
-          "helm-package": {
-            executor: "@storm-software/k8s-tools:helm-package",
-            outputs: ["{options.outputFolder}"],
-            options: {
-              chartFolder: `${project.root}/${options.chartFolder}`,
-              outputFolder: "{workspaceRoot}/dist/charts/{projectRoot}",
-              push: false,
-              remote: "oci://localhost:5000/helm-charts",
-              dependencies: {
-                update: true,
-                build: true,
-                repositories: []
-              }
-            }
+  }
+  (0, import_devkit.updateProjectConfiguration)(tree, options.project, {
+    ...project,
+    targets: {
+      ...project.targets,
+      "helm-package": {
+        executor: "@storm-software/k8s-tools:helm-package",
+        outputs: ["{options.outputFolder}"],
+        options: {
+          chartFolder: `${project.root}/${options.chartFolder}`,
+          outputFolder: "{workspaceRoot}/dist/charts/{projectRoot}",
+          push: false,
+          remote: "oci://localhost:5000/helm-charts",
+          dependencies: {
+            update: true,
+            build: true,
+            repositories: []
           }
         }
-      });
-      (0, import_devkit.generateFiles)(
-        tree,
-        (0, import_path.join)(__dirname, "files", "chart"),
-        (0, import_path.join)(project.root, options.chartFolder ?? ""),
-        options
-      );
-      if (options.format) {
-        await (0, import_devkit.formatFiles)(tree);
       }
-    });
-    return (0, import_devkit.runTasksInSerial)(...tasks);
-  } catch (error) {
-    return () => {
-      writeFatal(
-        "A fatal error occurred while running the generator - the process was forced to terminate",
-        config
-      );
-      writeError(
-        `An exception was thrown in the generator's process 
- - Details: ${error.message}
- - Stacktrace: ${error.stack}`,
-        config
-      );
-    };
-  } finally {
-    stopwatch();
+    }
+  });
+  (0, import_devkit.generateFiles)(
+    tree,
+    (0, import_path.join)(__dirname, "files", "chart"),
+    (0, import_path.join)(project.root, options.chartFolder ?? ""),
+    options
+  );
+  if (options.format) {
+    await (0, import_devkit.formatFiles)(tree);
   }
+  return {
+    success: true
+  };
 }
-var generator_default = helmChartGenerator;
-var helmChartSchematic = (0, import_devkit.convertNxGenerator)(helmChartGenerator);
+var generator_default = (0, import_workspace_tools.withRunGenerator)(
+  "Helm Chart",
+  helmChartGeneratorFn
+);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  helmChartGenerator,
-  helmChartSchematic
+  helmChartGeneratorFn
 });

package/src/generators/helm-dependency/generator.d.ts

@@ -1,5 +1,8 @@
-import { GeneratorCallback, Tree } from "@nx/devkit";
+import { Tree } from "@nx/devkit";
+import { StormConfig } from "@storm-software/config";
 import type { HelmDependencyGeneratorSchema } from "./schema";
-export declare function helmDependencyGenerator(tree: Tree, options: HelmDependencyGeneratorSchema): Promise<GeneratorCallback>;
-export default helmDependencyGenerator;
-export declare const helmDependencySchematic: (generatorOptions: HelmDependencyGeneratorSchema) => (tree: any, context: any) => Promise<any>;
+export declare function helmDependencyGeneratorFn(tree: Tree, options: HelmDependencyGeneratorSchema, config?: StormConfig): Promise<{
+    success: boolean;
+}>;
+declare const _default: (tree: Tree, _options: HelmDependencyGeneratorSchema) => Promise<import("@nx/devkit").GeneratorCallback | import("packages/workspace-tools/declarations").BaseGeneratorResult>;
+export default _default;

package/src/generators/helm-dependency/generator.js

@@ -30,11 +30,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var generator_exports = {};
 __export(generator_exports, {
   default: () => generator_default,
-  helmDependencyGenerator: () => helmDependencyGenerator,
-  helmDependencySchematic: () => helmDependencySchematic
+  helmDependencyGeneratorFn: () => helmDependencyGeneratorFn
 });
 module.exports = __toCommonJS(generator_exports);
 var import_devkit = require("@nx/devkit");
+var import_workspace_tools = require("@storm-software/workspace-tools");
 
 // node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs
 function isNothing(subject) {
@@ -2659,84 +2659,37 @@ var jsYaml = {
 var js_yaml_default = jsYaml;
 
 // packages/k8s-tools/src/generators/helm-dependency/generator.ts
-async function helmDependencyGenerator(tree, options) {
-  const {
-    getStopwatch,
-    writeDebug,
-    writeError,
-    writeFatal,
-    writeInfo,
-    writeTrace,
-    findWorkspaceRoot,
-    loadStormConfig
-  } = await import("@storm-software/config-tools");
-  const stopwatch = getStopwatch("Storm Worker generator");
-  let config;
-  try {
-    writeInfo(`\u26A1 Running the Storm Worker generator...
-
-`, config);
-    const workspaceRoot = findWorkspaceRoot();
-    writeDebug(
-      `Loading the Storm Config from environment variables and storm.json file...
-- workspaceRoot: ${workspaceRoot}`,
-      config
+async function helmDependencyGeneratorFn(tree, options, config) {
+  const { writeTrace } = await import("@storm-software/config-tools");
+  writeTrace("\u{1F4DD}  Preparing to add Helm Dependency", config);
+  const project = (0, import_devkit.readProjectConfiguration)(tree, options.project);
+  if (!project.targets?.["helm-package"]) {
+    throw new Error(
+      `Project ${options.project} does not have a helm target. Please run the chart generator first.`
     );
-    config = await loadStormConfig(workspaceRoot);
-    writeTrace(
-      `Loaded Storm config into env: 
-${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
-      config
-    );
-    const tasks = [];
-    tasks.push(async () => {
-      const project = (0, import_devkit.readProjectConfiguration)(tree, options.project);
-      if (!project.targets?.["helm-package"]) {
-        throw new Error(
-          `Project ${options.project} does not have a helm target. Please run the chart generator first.`
-        );
-      }
-      (0, import_devkit.updateProjectConfiguration)(
-        tree,
-        options.project,
-        addDependencyToConfig(
-          project,
-          options.repositoryName,
-          options.repository
-        )
-      );
-      updateChartYaml(
-        tree,
-        project,
-        options.chartName,
-        options.chartVersion,
-        options.repository
-      );
-      if (options.format) {
-        await (0, import_devkit.formatFiles)(tree);
-      }
-    });
-    return (0, import_devkit.runTasksInSerial)(...tasks);
-  } catch (error) {
-    return () => {
-      writeFatal(
-        "A fatal error occurred while running the generator - the process was forced to terminate",
-        config
-      );
-      writeError(
-        `An exception was thrown in the generator's process 
- - Details: ${error.message}
- - Stacktrace: ${error.stack}`,
-        config
-      );
-    };
-  } finally {
-    stopwatch();
-  }
-}
-var generator_default = helmDependencyGenerator;
-var helmDependencySchematic = (0, import_devkit.convertNxGenerator)(
-  helmDependencyGenerator
+  }
+  (0, import_devkit.updateProjectConfiguration)(
+    tree,
+    options.project,
+    addDependencyToConfig(project, options.repositoryName, options.repository)
+  );
+  updateChartYaml(
+    tree,
+    project,
+    options.chartName,
+    options.chartVersion,
+    options.repository
+  );
+  if (options.format) {
+    await (0, import_devkit.formatFiles)(tree);
+  }
+  return {
+    success: true
+  };
+}
+var generator_default = (0, import_workspace_tools.withRunGenerator)(
+  "Helm Dependency",
+  helmDependencyGeneratorFn
 );
 function addDependencyToConfig(project, name, url) {
   return {
@@ -2795,8 +2748,7 @@ function updateChartYaml(tree, project, name, version, repository) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  helmDependencyGenerator,
-  helmDependencySchematic
+  helmDependencyGeneratorFn
 });
 /*! Bundled license information:
 

package/src/utils/client.d.ts

@@ -1,22 +1,27 @@
 import { AbstractHelmClient, PackageOptions, PushOptions } from "../types";
 /** Helm wrapper class */
 export declare class HelmClient extends AbstractHelmClient {
+    /**
+     * Creates an instance of HelmClient
+     */
+    constructor();
     /**
      * Package a chart directory into a chart archive
      *
      * @param {PackageOptions} [options]
      */
     package(options: PackageOptions): Promise<string | undefined>;
-    push(options: PushOptions): Promise<void>;
-    dependencyUpdate(chartFolder: string): Promise<void>;
-    dependencyBuild(chartFolder: string): Promise<void>;
-    addRepository(name: string, url: string): Promise<void>;
+    push(options: PushOptions): void;
+    dependencyUpdate(chartFolder: string): void;
+    dependencyBuild(chartFolder: string): void;
+    addRepository(name: string, url: string): void;
     /**
      * Initialize Helm
      *
-     * @returns {Promise<void>}
+     * @returns A promise
      */
     initialize(): Promise<void>;
+    private runCommand;
 }
 /**
  * Create a new Helm client instance