@storm-software/k8s-tools 0.7.0 → 0.8.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.8.0 (2024-09-06)
+
+### Features
+
+- **k8s-tools:** Added extra fields onto the released container's `meta.json`
+  file ([14356536](https://github.com/storm-software/storm-ops/commit/14356536))
+
+### Bug Fixes
+
+- **workspace-tools:** Resolved the duplicate export name issue
+  ([f2586335](https://github.com/storm-software/storm-ops/commit/f2586335))
+
 ## 0.7.0 (2024-09-05)
 
 ### Features

package/index.js

@@ -49,41 +49,10 @@ __export(k8s_tools_exports, {
 module.exports = __toCommonJS(k8s_tools_exports);
 
 // packages/k8s-tools/src/executors/container-publish/executor.ts
-var import_devkit2 = require("@nx/devkit");
+var import_devkit = require("@nx/devkit");
 var import_apply_workspace_tokens = require("@storm-software/workspace-tools/utils/apply-workspace-tokens");
+var import_package_helpers = require("@storm-software/workspace-tools/utils/package-helpers");
 var import_node_https = __toESM(require("node:https"));
-
-// packages/k8s-tools/src/utils/package-helpers.ts
-var import_devkit = require("@nx/devkit");
-var import_project_tags = require("@storm-software/workspace-tools/utils/project-tags");
-var import_toml = require("@storm-software/workspace-tools/utils/toml");
-var import_node_fs = require("node:fs");
-var getPackageManager = (project) => {
-  if ((0, import_project_tags.isEqualProjectTag)(
-    project,
-    import_project_tags.ProjectTagConstants.Language.TAG_ID,
-    import_project_tags.ProjectTagConstants.Language.RUST
-  ) && (0, import_node_fs.existsSync)((0, import_devkit.joinPathFragments)(project.root, "Cargo.toml"))) {
-    return {
-      type: "Cargo.toml",
-      content: (0, import_toml.parseCargoToml)((0, import_devkit.joinPathFragments)(project.root, "Cargo.toml"))
-    };
-  } else if ((0, import_project_tags.isEqualProjectTag)(
-    project,
-    import_project_tags.ProjectTagConstants.Language.TAG_ID,
-    import_project_tags.ProjectTagConstants.Language.TYPESCRIPT
-  ) && (0, import_node_fs.existsSync)((0, import_devkit.joinPathFragments)(project.root, "package.json"))) {
-    return {
-      type: "package.json",
-      content: (0, import_devkit.readJsonFile)(
-        (0, import_devkit.joinPathFragments)(project.root, "package.json")
-      )
-    };
-  }
-  return null;
-};
-
-// packages/k8s-tools/src/executors/container-publish/executor.ts
 var getRegistryVersion = (name2, config) => {
   if (!name2) {
     throw new Error(
@@ -342,19 +311,19 @@ var executor_default = (0, import_base_executor.withRunExecutor)(
 );
 
 // packages/k8s-tools/src/generators/helm-chart/generator.ts
-var import_devkit3 = require("@nx/devkit");
+var import_devkit2 = require("@nx/devkit");
 var import_base_generator = require("@storm-software/workspace-tools/base/base-generator");
 var import_path = require("path");
 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_devkit3.readProjectConfiguration)(tree, options.project);
+  const project = (0, import_devkit2.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_devkit3.updateProjectConfiguration)(tree, options.project, {
+  (0, import_devkit2.updateProjectConfiguration)(tree, options.project, {
     ...project,
     targets: {
       ...project.targets,
@@ -375,14 +344,14 @@ async function helmChartGeneratorFn(tree, options, config) {
       }
     }
   });
-  (0, import_devkit3.generateFiles)(
+  (0, import_devkit2.generateFiles)(
     tree,
     (0, import_path.join)(__dirname, "files", "chart"),
     (0, import_path.join)(project.root, options.chartFolder ?? ""),
     options
   );
   if (options.format) {
-    await (0, import_devkit3.formatFiles)(tree);
+    await (0, import_devkit2.formatFiles)(tree);
   }
   return {
     success: true
@@ -394,7 +363,7 @@ var generator_default = (0, import_base_generator.withRunGenerator)(
 );
 
 // packages/k8s-tools/src/generators/helm-dependency/generator.ts
-var import_devkit4 = require("@nx/devkit");
+var import_devkit3 = require("@nx/devkit");
 var import_base_generator2 = require("@storm-software/workspace-tools/base/base-generator");
 
 // node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs
@@ -3023,13 +2992,13 @@ var js_yaml_default = jsYaml;
 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_devkit4.readProjectConfiguration)(tree, options.project);
+  const project = (0, import_devkit3.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_devkit4.updateProjectConfiguration)(
+  (0, import_devkit3.updateProjectConfiguration)(
     tree,
     options.project,
     addDependencyToConfig(project, options.repositoryName, options.repository)
@@ -3042,7 +3011,7 @@ async function helmDependencyGeneratorFn(tree, options, config) {
     options.repository
   );
   if (options.format) {
-    await (0, import_devkit4.formatFiles)(tree);
+    await (0, import_devkit3.formatFiles)(tree);
   }
   return {
     success: true
@@ -3109,9 +3078,10 @@ function updateChartYaml(tree, project, name2, version, repository) {
 }
 
 // packages/k8s-tools/src/plugins/docker/_dockerfile.ts
-var import_devkit5 = require("@nx/devkit");
-var import_project_tags2 = require("@storm-software/workspace-tools/utils/project-tags");
-var import_node_fs2 = require("node:fs");
+var import_devkit4 = require("@nx/devkit");
+var import_package_helpers2 = require("@storm-software/workspace-tools/utils/package-helpers");
+var import_project_tags = require("@storm-software/workspace-tools/utils/project-tags");
+var import_node_fs = require("node:fs");
 var name = "storm-software/docker/dockerfile";
 var description = "Plugin for parsing Dockerfile files";
 var createNodes = [
@@ -3124,11 +3094,11 @@ var createNodes = [
     }
     const { loadStormConfig, findWorkspaceRoot } = await import("@storm-software/config-tools");
     const root = dockerFilePath.substring(dockerFilePath.lastIndexOf("/") + 1);
-    const projectJsonPath = (0, import_devkit5.joinPathFragments)(root, "project.json");
-    if (!(0, import_node_fs2.existsSync)(projectJsonPath)) {
+    const projectJsonPath = (0, import_devkit4.joinPathFragments)(root, "project.json");
+    if (!(0, import_node_fs.existsSync)(projectJsonPath)) {
       return {};
     }
-    const projectJson = (0, import_devkit5.readJsonFile)(projectJsonPath);
+    const projectJson = (0, import_devkit4.readJsonFile)(projectJsonPath);
     if (projectJson?.name) {
       return {};
     }
@@ -3154,7 +3124,7 @@ var createNodes = [
       `org.opencontainers.image.source=${config.repository}`
     ];
     let tag = "latest";
-    const packageManager = getPackageManager(project);
+    const packageManager = (0, import_package_helpers2.getPackageInfo)(project);
     if (packageManager) {
       if (packageManager.type === "Cargo.toml") {
         tag = packageManager.content.package.version;
@@ -3216,11 +3186,11 @@ var createNodes = [
         }
       }
     };
-    if (((0, import_project_tags2.isEqualProjectTag)(
+    if (((0, import_project_tags.isEqualProjectTag)(
       project,
-      import_project_tags2.ProjectTagConstants.ProjectType.TAG_ID,
-      import_project_tags2.ProjectTagConstants.ProjectType.APPLICATION
-    ) || project.projectType === "application") && (0, import_project_tags2.hasProjectTag)(project, import_project_tags2.ProjectTagConstants.Registry.TAG_ID)) {
+      import_project_tags.ProjectTagConstants.ProjectType.TAG_ID,
+      import_project_tags.ProjectTagConstants.ProjectType.APPLICATION
+    ) || project.projectType === "application") && (0, import_project_tags.hasProjectTag)(project, import_project_tags.ProjectTagConstants.Registry.TAG_ID)) {
       if (project.targets["nx-release-publish"]) {
         project.targets["nx-release-publish"] = {
           ...project.targets["nx-release-publish"],
@@ -3247,7 +3217,7 @@ var createNodes = [
         };
       }
     }
-    (0, import_project_tags2.setDefaultProjectTags)(project);
+    (0, import_project_tags.setDefaultProjectTags)(project);
     const projects = {};
     const externalNodes = {};
     projects[project.root] = {

package/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/k8s-tools/src/utils/package-helpers.ts":{"bytes":1567,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/executors/clean-package/types","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/toml","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true}],"format":"esm"},"packages/k8s-tools/src/executors/container-publish/executor.ts":{"bytes":6601,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/config","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/apply-workspace-tokens","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/toml","kind":"import-statement","external":true},{"path":"node:https","kind":"import-statement","external":true},{"path":"packages/k8s-tools/src/utils/package-helpers.ts","kind":"import-statement","original":"../../utils/package-helpers"},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"packages/k8s-tools/src/types.ts":{"bytes":859,"imports":[{"path":"prettier","kind":"import-statement","external":true}],"format":"esm"},"packages/k8s-tools/src/utils/ensure-init.ts":{"bytes":956,"imports":[{"path":"../types","kind":"import-statement","external":true}],"format":"esm"},"packages/k8s-tools/src/utils/client.ts":{"bytes":3533,"imports":[{"path":"node:child_process","kind":"import-statement","external":true},{"path":"packages/k8s-tools/src/types.ts","kind":"import-statement","original":"../types"},{"path":"packages/k8s-tools/src/utils/ensure-init.ts","kind":"import-statement","original":"./ensure-init"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"packages/k8s-tools/src/executors/helm-package/executor.ts":{"bytes":1977,"imports":[{"path":"@storm-software/workspace-tools/base/base-executor","kind":"import-statement","external":true},{"path":"packages/k8s-tools/src/utils/client.ts","kind":"import-statement","original":"../../utils/client"},{"path":"./schema","kind":"import-statement","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"packages/k8s-tools/src/executors/index.ts":{"bytes":87,"imports":[{"path":"packages/k8s-tools/src/executors/container-publish/executor.ts","kind":"import-statement","original":"./container-publish/executor"},{"path":"packages/k8s-tools/src/executors/helm-package/executor.ts","kind":"import-statement","original":"./helm-package/executor"}],"format":"esm"},"packages/k8s-tools/src/generators/helm-chart/generator.ts":{"bytes":1814,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/config","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"import-statement","external":true},{"path":"path","kind":"import-statement","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs":{"bytes":107533,"imports":[],"format":"esm"},"packages/k8s-tools/src/generators/helm-dependency/generator.ts":{"bytes":3414,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/config","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"import-statement","external":true},{"path":"node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs","kind":"import-statement","original":"js-yaml"},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"packages/k8s-tools/src/generators/index.ts":{"bytes":85,"imports":[{"path":"packages/k8s-tools/src/generators/helm-chart/generator.ts","kind":"import-statement","original":"./helm-chart/generator"},{"path":"packages/k8s-tools/src/generators/helm-dependency/generator.ts","kind":"import-statement","original":"./helm-dependency/generator"}],"format":"esm"},"packages/k8s-tools/src/plugins/docker/_dockerfile.ts":{"bytes":6642,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/toml","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"packages/k8s-tools/src/utils/package-helpers.ts","kind":"import-statement","original":"../../utils/package-helpers"},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"packages/k8s-tools/src/plugins/docker/index.ts":{"bytes":31,"imports":[{"path":"packages/k8s-tools/src/plugins/docker/_dockerfile.ts","kind":"import-statement","original":"./_dockerfile"}],"format":"esm"},"packages/k8s-tools/src/plugins/index.ts":{"bytes":26,"imports":[{"path":"packages/k8s-tools/src/plugins/docker/index.ts","kind":"import-statement","original":"./docker"}],"format":"esm"},"packages/k8s-tools/src/index.ts":{"bytes":86,"imports":[{"path":"packages/k8s-tools/src/executors/index.ts","kind":"import-statement","original":"./executors"},{"path":"packages/k8s-tools/src/generators/index.ts","kind":"import-statement","original":"./generators"},{"path":"packages/k8s-tools/src/plugins/index.ts","kind":"import-statement","original":"./plugins"}],"format":"esm"},"packages/k8s-tools/index.ts":{"bytes":23,"imports":[{"path":"packages/k8s-tools/src/index.ts","kind":"import-statement","original":"./src"}],"format":"esm"}},"outputs":{"dist/packages/k8s-tools/index.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/apply-workspace-tokens","kind":"require-call","external":true},{"path":"node:https","kind":"require-call","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/toml","kind":"require-call","external":true},{"path":"node:fs","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-executor","kind":"require-call","external":true},{"path":"node:child_process","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"require-call","external":true},{"path":"path","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"require-call","external":true},{"path":"node:fs","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/index.ts","inputs":{"packages/k8s-tools/index.ts":{"bytesInOutput":447},"packages/k8s-tools/src/executors/container-publish/executor.ts":{"bytesInOutput":1936},"packages/k8s-tools/src/utils/package-helpers.ts":{"bytesInOutput":1238},"packages/k8s-tools/src/executors/index.ts":{"bytesInOutput":0},"packages/k8s-tools/src/executors/helm-package/executor.ts":{"bytesInOutput":1555},"packages/k8s-tools/src/utils/client.ts":{"bytesInOutput":3290},"packages/k8s-tools/src/types.ts":{"bytesInOutput":134},"packages/k8s-tools/src/utils/ensure-init.ts":{"bytesInOutput":579},"packages/k8s-tools/src/index.ts":{"bytesInOutput":0},"packages/k8s-tools/src/generators/helm-chart/generator.ts":{"bytesInOutput":1689},"packages/k8s-tools/src/generators/index.ts":{"bytesInOutput":0},"packages/k8s-tools/src/generators/helm-dependency/generator.ts":{"bytesInOutput":2873},"node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs":{"bytesInOutput":88006},"packages/k8s-tools/src/plugins/docker/_dockerfile.ts":{"bytesInOutput":5761},"packages/k8s-tools/src/plugins/docker/index.ts":{"bytesInOutput":0},"packages/k8s-tools/src/plugins/index.ts":{"bytesInOutput":0}},"bytes":110506},"dist/packages/k8s-tools/src/executors/helm-package/executor.js":{"imports":[{"path":"@storm-software/workspace-tools/base/base-executor","kind":"require-call","external":true},{"path":"node:child_process","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/executors/helm-package/executor.ts","inputs":{"packages/k8s-tools/src/executors/helm-package/executor.ts":{"bytesInOutput":1736},"packages/k8s-tools/src/utils/client.ts":{"bytesInOutput":3288},"packages/k8s-tools/src/types.ts":{"bytesInOutput":134},"packages/k8s-tools/src/utils/ensure-init.ts":{"bytesInOutput":579}},"bytes":7918},"dist/packages/k8s-tools/src/executors/container-publish/executor.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/apply-workspace-tokens","kind":"require-call","external":true},{"path":"node:https","kind":"require-call","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/toml","kind":"require-call","external":true},{"path":"node:fs","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/executors/container-publish/executor.ts","inputs":{"packages/k8s-tools/src/executors/container-publish/executor.ts":{"bytesInOutput":5692},"packages/k8s-tools/src/utils/package-helpers.ts":{"bytesInOutput":1238}},"bytes":8610},"dist/packages/k8s-tools/src/generators/helm-chart/generator.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"require-call","external":true},{"path":"path","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/generators/helm-chart/generator.ts","inputs":{"packages/k8s-tools/src/generators/helm-chart/generator.ts":{"bytesInOutput":1883}},"bytes":3441},"dist/packages/k8s-tools/src/generators/helm-dependency/generator.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/generators/helm-dependency/generator.ts","inputs":{"packages/k8s-tools/src/generators/helm-dependency/generator.ts":{"bytesInOutput":3051},"node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs":{"bytesInOutput":87999}},"bytes":92893},"dist/packages/k8s-tools/src/plugins/docker/index.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"require-call","external":true},{"path":"node:fs","kind":"require-call","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/toml","kind":"require-call","external":true},{"path":"node:fs","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/plugins/docker/index.ts","inputs":{"packages/k8s-tools/src/plugins/docker/index.ts":{"bytesInOutput":238},"packages/k8s-tools/src/plugins/docker/_dockerfile.ts":{"bytesInOutput":5761},"packages/k8s-tools/src/utils/package-helpers.ts":{"bytesInOutput":1238}},"bytes":8989}}}
+{"inputs":{"packages/k8s-tools/src/executors/container-publish/executor.ts":{"bytes":6726,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/config","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/apply-workspace-tokens","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/package-helpers","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/toml","kind":"import-statement","external":true},{"path":"node:https","kind":"import-statement","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"packages/k8s-tools/src/types.ts":{"bytes":859,"imports":[{"path":"prettier","kind":"import-statement","external":true}],"format":"esm"},"packages/k8s-tools/src/utils/ensure-init.ts":{"bytes":956,"imports":[{"path":"../types","kind":"import-statement","external":true}],"format":"esm"},"packages/k8s-tools/src/utils/client.ts":{"bytes":3533,"imports":[{"path":"node:child_process","kind":"import-statement","external":true},{"path":"packages/k8s-tools/src/types.ts","kind":"import-statement","original":"../types"},{"path":"packages/k8s-tools/src/utils/ensure-init.ts","kind":"import-statement","original":"./ensure-init"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"packages/k8s-tools/src/executors/helm-package/executor.ts":{"bytes":1977,"imports":[{"path":"@storm-software/workspace-tools/base/base-executor","kind":"import-statement","external":true},{"path":"packages/k8s-tools/src/utils/client.ts","kind":"import-statement","original":"../../utils/client"},{"path":"./schema","kind":"import-statement","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"packages/k8s-tools/src/executors/index.ts":{"bytes":87,"imports":[{"path":"packages/k8s-tools/src/executors/container-publish/executor.ts","kind":"import-statement","original":"./container-publish/executor"},{"path":"packages/k8s-tools/src/executors/helm-package/executor.ts","kind":"import-statement","original":"./helm-package/executor"}],"format":"esm"},"packages/k8s-tools/src/generators/helm-chart/generator.ts":{"bytes":1814,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/config","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"import-statement","external":true},{"path":"path","kind":"import-statement","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs":{"bytes":107533,"imports":[],"format":"esm"},"packages/k8s-tools/src/generators/helm-dependency/generator.ts":{"bytes":3414,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/config","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"import-statement","external":true},{"path":"node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs","kind":"import-statement","original":"js-yaml"},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"packages/k8s-tools/src/generators/index.ts":{"bytes":85,"imports":[{"path":"packages/k8s-tools/src/generators/helm-chart/generator.ts","kind":"import-statement","original":"./helm-chart/generator"},{"path":"packages/k8s-tools/src/generators/helm-dependency/generator.ts","kind":"import-statement","original":"./helm-dependency/generator"}],"format":"esm"},"packages/k8s-tools/src/plugins/docker/_dockerfile.ts":{"bytes":6662,"imports":[{"path":"@nx/devkit","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/package-helpers","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"import-statement","external":true},{"path":"@storm-software/workspace-tools/utils/toml","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"format":"esm"},"packages/k8s-tools/src/plugins/docker/index.ts":{"bytes":31,"imports":[{"path":"packages/k8s-tools/src/plugins/docker/_dockerfile.ts","kind":"import-statement","original":"./_dockerfile"}],"format":"esm"},"packages/k8s-tools/src/plugins/index.ts":{"bytes":26,"imports":[{"path":"packages/k8s-tools/src/plugins/docker/index.ts","kind":"import-statement","original":"./docker"}],"format":"esm"},"packages/k8s-tools/src/index.ts":{"bytes":86,"imports":[{"path":"packages/k8s-tools/src/executors/index.ts","kind":"import-statement","original":"./executors"},{"path":"packages/k8s-tools/src/generators/index.ts","kind":"import-statement","original":"./generators"},{"path":"packages/k8s-tools/src/plugins/index.ts","kind":"import-statement","original":"./plugins"}],"format":"esm"},"packages/k8s-tools/index.ts":{"bytes":23,"imports":[{"path":"packages/k8s-tools/src/index.ts","kind":"import-statement","original":"./src"}],"format":"esm"}},"outputs":{"dist/packages/k8s-tools/index.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/apply-workspace-tokens","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/package-helpers","kind":"require-call","external":true},{"path":"node:https","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-executor","kind":"require-call","external":true},{"path":"node:child_process","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"require-call","external":true},{"path":"path","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true},{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/package-helpers","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"require-call","external":true},{"path":"node:fs","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/index.ts","inputs":{"packages/k8s-tools/index.ts":{"bytesInOutput":447},"packages/k8s-tools/src/executors/container-publish/executor.ts":{"bytesInOutput":2030},"packages/k8s-tools/src/executors/index.ts":{"bytesInOutput":0},"packages/k8s-tools/src/executors/helm-package/executor.ts":{"bytesInOutput":1555},"packages/k8s-tools/src/utils/client.ts":{"bytesInOutput":3290},"packages/k8s-tools/src/types.ts":{"bytesInOutput":134},"packages/k8s-tools/src/utils/ensure-init.ts":{"bytesInOutput":579},"packages/k8s-tools/src/index.ts":{"bytesInOutput":0},"packages/k8s-tools/src/generators/helm-chart/generator.ts":{"bytesInOutput":1689},"packages/k8s-tools/src/generators/index.ts":{"bytesInOutput":0},"packages/k8s-tools/src/generators/helm-dependency/generator.ts":{"bytesInOutput":2873},"node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs":{"bytesInOutput":88006},"packages/k8s-tools/src/plugins/docker/_dockerfile.ts":{"bytesInOutput":5874},"packages/k8s-tools/src/plugins/docker/index.ts":{"bytesInOutput":0},"packages/k8s-tools/src/plugins/index.ts":{"bytesInOutput":0}},"bytes":109356},"dist/packages/k8s-tools/src/executors/helm-package/executor.js":{"imports":[{"path":"@storm-software/workspace-tools/base/base-executor","kind":"require-call","external":true},{"path":"node:child_process","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/executors/helm-package/executor.ts","inputs":{"packages/k8s-tools/src/executors/helm-package/executor.ts":{"bytesInOutput":1736},"packages/k8s-tools/src/utils/client.ts":{"bytesInOutput":3288},"packages/k8s-tools/src/types.ts":{"bytesInOutput":134},"packages/k8s-tools/src/utils/ensure-init.ts":{"bytesInOutput":579}},"bytes":7918},"dist/packages/k8s-tools/src/executors/container-publish/executor.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/apply-workspace-tokens","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/package-helpers","kind":"require-call","external":true},{"path":"node:https","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/executors/container-publish/executor.ts","inputs":{"packages/k8s-tools/src/executors/container-publish/executor.ts":{"bytesInOutput":5914}},"bytes":7475},"dist/packages/k8s-tools/src/generators/helm-chart/generator.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"require-call","external":true},{"path":"path","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/generators/helm-chart/generator.ts","inputs":{"packages/k8s-tools/src/generators/helm-chart/generator.ts":{"bytesInOutput":1883}},"bytes":3441},"dist/packages/k8s-tools/src/generators/helm-dependency/generator.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/base/base-generator","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/generators/helm-dependency/generator.ts","inputs":{"packages/k8s-tools/src/generators/helm-dependency/generator.ts":{"bytesInOutput":3051},"node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs":{"bytesInOutput":87999}},"bytes":92893},"dist/packages/k8s-tools/src/plugins/docker/index.js":{"imports":[{"path":"@nx/devkit","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/package-helpers","kind":"require-call","external":true},{"path":"@storm-software/workspace-tools/utils/project-tags","kind":"require-call","external":true},{"path":"node:fs","kind":"require-call","external":true},{"path":"@storm-software/config-tools","kind":"dynamic-import","external":true}],"exports":[],"entryPoint":"packages/k8s-tools/src/plugins/docker/index.ts","inputs":{"packages/k8s-tools/src/plugins/docker/index.ts":{"bytesInOutput":238},"packages/k8s-tools/src/plugins/docker/_dockerfile.ts":{"bytesInOutput":5869}},"bytes":7750}}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/k8s-tools",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "type": "commonjs",
   "description": "⚡ A Nx plugin package that contains various executors, generators, and utilities that assist in managing k8s IoC.",
   "repository": {

package/src/executors/container-publish/executor.js

@@ -33,41 +33,10 @@ __export(executor_exports, {
   getRegistryVersion: () => getRegistryVersion
 });
 module.exports = __toCommonJS(executor_exports);
-var import_devkit2 = require("@nx/devkit");
+var import_devkit = require("@nx/devkit");
 var import_apply_workspace_tokens = require("@storm-software/workspace-tools/utils/apply-workspace-tokens");
+var import_package_helpers = require("@storm-software/workspace-tools/utils/package-helpers");
 var import_node_https = __toESM(require("node:https"));
-
-// packages/k8s-tools/src/utils/package-helpers.ts
-var import_devkit = require("@nx/devkit");
-var import_project_tags = require("@storm-software/workspace-tools/utils/project-tags");
-var import_toml = require("@storm-software/workspace-tools/utils/toml");
-var import_node_fs = require("node:fs");
-var getPackageManager = (project) => {
-  if ((0, import_project_tags.isEqualProjectTag)(
-    project,
-    import_project_tags.ProjectTagConstants.Language.TAG_ID,
-    import_project_tags.ProjectTagConstants.Language.RUST
-  ) && (0, import_node_fs.existsSync)((0, import_devkit.joinPathFragments)(project.root, "Cargo.toml"))) {
-    return {
-      type: "Cargo.toml",
-      content: (0, import_toml.parseCargoToml)((0, import_devkit.joinPathFragments)(project.root, "Cargo.toml"))
-    };
-  } else if ((0, import_project_tags.isEqualProjectTag)(
-    project,
-    import_project_tags.ProjectTagConstants.Language.TAG_ID,
-    import_project_tags.ProjectTagConstants.Language.TYPESCRIPT
-  ) && (0, import_node_fs.existsSync)((0, import_devkit.joinPathFragments)(project.root, "package.json"))) {
-    return {
-      type: "package.json",
-      content: (0, import_devkit.readJsonFile)(
-        (0, import_devkit.joinPathFragments)(project.root, "package.json")
-      )
-    };
-  }
-  return null;
-};
-
-// packages/k8s-tools/src/executors/container-publish/executor.ts
 async function* publishExecutor(options, context) {
   const { loadStormConfig, applyWorkspaceTokens, findWorkspaceRoot } = await import("@storm-software/config-tools");
   const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
@@ -110,7 +79,7 @@ async function* publishExecutor(options, context) {
       );
     } else {
       console.log(`Published to ${tokenized.registry}`);
-      const packageManager = getPackageManager(projectConfig);
+      const packageManager = (0, import_package_helpers.getPackageInfo)(projectConfig);
       if (packageManager) {
         tokenized["build-args"] ??= [
           "ENVIRONMENT=production",
@@ -118,10 +87,14 @@ async function* publishExecutor(options, context) {
         ];
         tokenized["labels"] ??= [];
         let version = "";
-        if (packageManager.type === "Cargo.toml") {
-          version = packageManager.content.package.version;
-        } else if (packageManager.type === "package.json") {
-          version = packageManager.content.version;
+        if (process.env.TAG) {
+          version = process.env.TAG;
+        } else {
+          if (packageManager.type === "Cargo.toml") {
+            version = packageManager.content.package.version;
+          } else if (packageManager.type === "package.json") {
+            version = packageManager.content.version;
+          }
         }
         tokenized["build-args"].push(`RELEASE=${version}`);
         tokenized["labels"].push(`org.opencontainers.image.version=${version}`);
@@ -146,11 +119,11 @@ async function* publishExecutor(options, context) {
           success: true
         };
       }
-      const { project, target, configuration } = (0, import_devkit2.parseTargetString)(
+      const { project, target, configuration } = (0, import_devkit.parseTargetString)(
         "container",
         context
       );
-      for await (const output of await (0, import_devkit2.runExecutor)({ project, target, configuration }, tokenized, context)) {
+      for await (const output of await (0, import_devkit.runExecutor)({ project, target, configuration }, tokenized, context)) {
         if (!output.success) {
           throw new Error("Could not compile application files");
         }

package/src/plugins/docker/index.js

@@ -37,41 +37,10 @@ __export(docker_exports, {
 module.exports = __toCommonJS(docker_exports);
 
 // packages/k8s-tools/src/plugins/docker/_dockerfile.ts
-var import_devkit2 = require("@nx/devkit");
-var import_project_tags2 = require("@storm-software/workspace-tools/utils/project-tags");
-var import_node_fs2 = require("node:fs");
-
-// packages/k8s-tools/src/utils/package-helpers.ts
 var import_devkit = require("@nx/devkit");
+var import_package_helpers = require("@storm-software/workspace-tools/utils/package-helpers");
 var import_project_tags = require("@storm-software/workspace-tools/utils/project-tags");
-var import_toml = require("@storm-software/workspace-tools/utils/toml");
 var import_node_fs = require("node:fs");
-var getPackageManager = (project) => {
-  if ((0, import_project_tags.isEqualProjectTag)(
-    project,
-    import_project_tags.ProjectTagConstants.Language.TAG_ID,
-    import_project_tags.ProjectTagConstants.Language.RUST
-  ) && (0, import_node_fs.existsSync)((0, import_devkit.joinPathFragments)(project.root, "Cargo.toml"))) {
-    return {
-      type: "Cargo.toml",
-      content: (0, import_toml.parseCargoToml)((0, import_devkit.joinPathFragments)(project.root, "Cargo.toml"))
-    };
-  } else if ((0, import_project_tags.isEqualProjectTag)(
-    project,
-    import_project_tags.ProjectTagConstants.Language.TAG_ID,
-    import_project_tags.ProjectTagConstants.Language.TYPESCRIPT
-  ) && (0, import_node_fs.existsSync)((0, import_devkit.joinPathFragments)(project.root, "package.json"))) {
-    return {
-      type: "package.json",
-      content: (0, import_devkit.readJsonFile)(
-        (0, import_devkit.joinPathFragments)(project.root, "package.json")
-      )
-    };
-  }
-  return null;
-};
-
-// packages/k8s-tools/src/plugins/docker/_dockerfile.ts
 var name = "storm-software/docker/dockerfile";
 var description = "Plugin for parsing Dockerfile files";
 var createNodes = [
@@ -84,11 +53,11 @@ var createNodes = [
     }
     const { loadStormConfig, findWorkspaceRoot } = await import("@storm-software/config-tools");
     const root = dockerFilePath.substring(dockerFilePath.lastIndexOf("/") + 1);
-    const projectJsonPath = (0, import_devkit2.joinPathFragments)(root, "project.json");
-    if (!(0, import_node_fs2.existsSync)(projectJsonPath)) {
+    const projectJsonPath = (0, import_devkit.joinPathFragments)(root, "project.json");
+    if (!(0, import_node_fs.existsSync)(projectJsonPath)) {
       return {};
     }
-    const projectJson = (0, import_devkit2.readJsonFile)(projectJsonPath);
+    const projectJson = (0, import_devkit.readJsonFile)(projectJsonPath);
     if (projectJson?.name) {
       return {};
     }
@@ -114,7 +83,7 @@ var createNodes = [
       `org.opencontainers.image.source=${config.repository}`
     ];
     let tag = "latest";
-    const packageManager = getPackageManager(project);
+    const packageManager = (0, import_package_helpers.getPackageInfo)(project);
     if (packageManager) {
       if (packageManager.type === "Cargo.toml") {
         tag = packageManager.content.package.version;
@@ -176,11 +145,11 @@ var createNodes = [
         }
       }
     };
-    if (((0, import_project_tags2.isEqualProjectTag)(
+    if (((0, import_project_tags.isEqualProjectTag)(
       project,
-      import_project_tags2.ProjectTagConstants.ProjectType.TAG_ID,
-      import_project_tags2.ProjectTagConstants.ProjectType.APPLICATION
-    ) || project.projectType === "application") && (0, import_project_tags2.hasProjectTag)(project, import_project_tags2.ProjectTagConstants.Registry.TAG_ID)) {
+      import_project_tags.ProjectTagConstants.ProjectType.TAG_ID,
+      import_project_tags.ProjectTagConstants.ProjectType.APPLICATION
+    ) || project.projectType === "application") && (0, import_project_tags.hasProjectTag)(project, import_project_tags.ProjectTagConstants.Registry.TAG_ID)) {
       if (project.targets["nx-release-publish"]) {
         project.targets["nx-release-publish"] = {
           ...project.targets["nx-release-publish"],
@@ -207,7 +176,7 @@ var createNodes = [
         };
       }
     }
-    (0, import_project_tags2.setDefaultProjectTags)(project);
+    (0, import_project_tags.setDefaultProjectTags)(project);
     const projects = {};
     const externalNodes = {};
     projects[project.root] = {

package/src/utils/package-helpers.d.ts

@@ -1,13 +0,0 @@
-import { ProjectConfiguration } from "@nx/devkit";
-import { PackageJson } from "@storm-software/workspace-tools/executors/clean-package/types";
-import { CargoToml } from "@storm-software/workspace-tools/utils/toml";
-export type PackageManagerType = "package.json" | "Cargo.toml";
-export declare const PackageManagerTypes: {
-    PackageJson: PackageManagerType;
-    CargoToml: PackageManagerType;
-};
-export type PackageManager = {
-    content: PackageJson | CargoToml;
-    type: "package.json" | "Cargo.toml";
-};
-export declare const getPackageManager: (project: ProjectConfiguration) => null | PackageManager;