Merge branch 'refs/heads/main' into 01700-add-dependency-injections-to-all-remaining-command-classes

# Conflicts:
#	src/commands/base.ts
#	src/commands/relay.ts
#	src/core/dependency-injection/container-init.ts
#	src/index.ts
#	test/e2e/integration/commands/init.test.ts
#	test/unit/commands/cluster.test.ts
#	test/unit/commands/network.test.ts

Author: Ivo-Yankov

.github/workflows/zxc-code-analysis.yaml

@@ -285,6 +285,13 @@ jobs:
           name: Unit Test Coverage Report
           path: 'coverage/unit'
 
+      - name: Download HelmClient Unit Test Coverage Report
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && !cancelled() && !failure() }}
+        with:
+          name: Unit Test Coverage Report
+          path: 'coverage/unit-helm'
+
       - name: Download E2E Integration Coverage Report
         uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}

.github/workflows/zxc-unit-test.yaml

@@ -78,6 +78,27 @@ jobs:
       - name: Run Unit Tests
         run: npm test
 
+      - name: Setup Helm
+        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
+        if: ${{ runner.os == 'linux' }}
+        with:
+          version: "v3.12.3" # helm version
+
+      - name: Setup Kind
+        uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
+        if: ${{ runner.os == 'linux' }}
+        with:
+          install_only: true
+          node_image: kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30
+          version: v0.26.0
+          kubectl_version: v1.31.4
+          verbosity: 3
+          wait: 120s
+
+      - name: Run Helm Client Unit Tests
+        if: ${{ runner.os == 'linux' }}
+        run: npm run test-helm
+
       - name: Publish Windows Unit Test Report
         uses: EnricoMi/publish-unit-test-result-action/windows/bash@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
         if: ${{ runner.os == 'Windows' && steps.npm-deps.conclusion == 'success' && !cancelled() }}
@@ -99,6 +120,13 @@ jobs:
           name: Unit Test Coverage Report
           path: 'coverage/unit'
 
+      - name: Publish HelmClient Unit Test Coverage Report
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        if: ${{ runner.os == 'linux' && !cancelled() }}
+        with:
+          name: HelmClient Unit Test Coverage Report
+          path: 'coverage/unit-helm'
+
       - name: Publish Test Reports
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ runner.os == 'linux' && steps.npm-deps.conclusion == 'success' && !cancelled() }}

.github/workflows/zxc-update-readme.yaml

@@ -78,6 +78,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y wget
 
+      - name: Setup Helm
+        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
+        with:
+          version: "v3.12.3" # helm version
+
       - name: Setup Kind
         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
         with:

Taskfile.helper.yml

@@ -315,7 +315,7 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- relay destroy -n "${SOLO_NAMESPACE}" -i node1 -q --dev
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- relay destroy --deployment "${SOLO_DEPLOYMENT}" -i node1 -q --dev
 
   solo:cache:remove:
     silent: true

eslint.config.mjs

@@ -131,7 +131,23 @@ export default [
       '@typescript-eslint/no-warning-comments': 'off',
       '@typescript-eslint/no-empty-function': 'off',
       '@typescript-eslint/no-var-requires': 'off',
-      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/explicit-function-return-type': [
+        'warn',
+        {
+          allowExpressions: false,
+          allowTypedFunctionExpressions: false,
+          allowHigherOrderFunctions: false,
+        },
+      ],
+      '@typescript-eslint/typedef': [
+        'warn',
+        {
+          variableDeclaration: true,
+          parameter: true,
+          propertyDeclaration: true,
+          memberVariableDeclaration: true,
+        },
+      ],
       '@typescript-eslint/explicit-module-boundary-types': 'off',
       '@typescript-eslint/ban-types': 'off',
       '@typescript-eslint/camelcase': 'off',

package-lock.json

@@ -11,7 +11,8 @@
     "access": "public"
   },
   "scripts": {
-    "test": "cross-env MOCHA_SUITE_NAME=\"Unit Tests\" c8 --report-dir='coverage/unit' mocha 'test/unit/**/*.ts' --reporter-options configFile=mocha-multi-reporter.json,cmrOutput=mocha-junit-reporter+mochaFile+junit.xml",
+    "test": "cross-env MOCHA_SUITE_NAME=\"Unit Tests\" c8 --report-dir='coverage/unit' mocha 'test/unit/**/*.ts' --exclude 'test/unit/core/helm/**/*.ts' --reporter-options configFile=mocha-multi-reporter.json,cmrOutput=mocha-junit-reporter+mochaFile+junit.xml",
+    "test-helm": "cross-env MOCHA_SUITE_NAME=\"Helm Unit Tests\" c8 --report-dir='coverage/unit-helm' mocha 'test/unit/core/helm/**/*.ts' --reporter-options configFile=mocha-multi-reporter.json,cmrOutput=mocha-junit-reporter+mochaFile+junit.xml",
     "test-mathex": "cross-env MOCHA_SUITE_NAME=\"MathEx Unit Tests\" c8 --report-dir='coverage/unit-mathex' mocha 'test/unit/**/math-ex*.ts' --reporter-options configFile=mocha-multi-reporter.json,cmrOutput=mocha-junit-reporter+mochaFile+junit.xml",
     "test-data": "cross-env MOCHA_SUITE_NAME=\"Data Layer Unit Tests\" c8 --report-dir='coverage/unit-data' mocha 'test/unit/data/**' --reporter-options configFile=mocha-multi-reporter.json,cmrOutput=mocha-junit-reporter+mochaFile+junit.xml",
     "test-e2e-all": "cross-env MOCHA_SUITE_NAME=\"Mocha E2E All Tests\" c8 --report-dir='coverage/e2e-all' mocha 'test/e2e/**/*.ts' --reporter-options configFile=mocha-multi-reporter.json,cmrOutput=mocha-junit-reporter+mochaFile+junit-e2e-all.xml",
@@ -99,7 +100,7 @@
     "@types/mocha": "^10.0.10",
     "@types/mocha-each": "^2.0.4",
     "@types/node": "^22.13.14",
-    "@types/semver": "^7.5.8",
+    "@types/semver": "^7.7.0",
     "@types/sinon": "^17.0.4",
     "@types/sinon-chai": "^4.0.0",
     "@types/stream-buffers": "^3.0.7",

package.json

@@ -5,11 +5,11 @@ import {ShellRunner} from '../core/shell-runner.js';
 import {type LockManager} from '../core/lock/lock-manager.js';
 import {type LocalConfig} from '../core/config/local/local-config.js';
 import {type RemoteConfigManager} from '../core/config/remote/remote-config-manager.js';
-import {type Helm} from '../core/helm.js';
-import {type K8Factory} from '../integration/kube/k8-factory.js';
 import {type ChartManager} from '../core/chart-manager.js';
 import {type ConfigManager} from '../core/config-manager.js';
 import {type DependencyManager} from '../core/dependency-managers/index.js';
+import {type K8Factory} from '../integration/kube/k8-factory.js';
+import {type HelmClient} from '../integration/helm/helm-client.js';
 import * as constants from '../core/constants.js';
 import fs from 'fs';
 import {type ClusterRef, type ClusterRefs} from '../core/config/remote/types.js';
@@ -21,7 +21,7 @@ import {InjectTokens} from '../core/dependency-injection/inject-tokens.js';
 
 export abstract class BaseCommand extends ShellRunner {
   constructor(
-    @inject(InjectTokens.Helm) protected readonly helm?: Helm,
+    @inject(InjectTokens.Helm) protected readonly helm?: HelmClient,
     @inject(InjectTokens.K8Factory) protected readonly k8Factory?: K8Factory,
     @inject(InjectTokens.ChartManager) protected readonly chartManager?: ChartManager,
     @inject(InjectTokens.ConfigManager) public readonly configManager?: ConfigManager,

src/commands/base.ts

@@ -4,7 +4,7 @@ import {type NamespaceName} from '../../../integration/kube/resources/namespace/
 import {type ClusterRef} from '../../../core/config/remote/types.js';
 
 export interface ClusterRefSetupConfigClass {
-  chartDir: string;
+  chartDirectory: string;
   clusterSetupNamespace: NamespaceName;
   deployMinio: boolean;
   deployPrometheusStack: boolean;

src/commands/cluster/config-interfaces/cluster-ref-setup-config-class.ts

@@ -4,7 +4,6 @@ import {type ClusterRefSetupConfigClass} from './cluster-ref-setup-config-class.
 
 export interface ClusterRefSetupContext {
   config: ClusterRefSetupConfigClass;
-  chartPath: string;
   isChartInstalled: boolean;
   valuesArg: string;
   context: string;

src/commands/cluster/config-interfaces/cluster-ref-setup-context.ts

@@ -103,7 +103,7 @@ export class ClusterCommandConfigs {
     ]);
 
     ctx.config = {
-      chartDir: configManager.getFlag(flags.chartDirectory),
+      chartDirectory: configManager.getFlag(flags.chartDirectory),
       clusterSetupNamespace: configManager.getFlag<NamespaceName>(flags.clusterSetupNamespace),
       deployMinio: configManager.getFlag<boolean>(flags.deployMinio),
       deployPrometheusStack: configManager.getFlag<boolean>(flags.deployPrometheusStack),

src/commands/cluster/configs.ts

@@ -2,7 +2,7 @@
 
 import {Flags as flags} from '../flags.js';
 import {type ArgvStruct, type AnyListrContext, type ConfigBuilder} from '../../types/aliases.js';
-import {prepareChartPath, showVersionBanner} from '../../core/helpers.js';
+import {showVersionBanner} from '../../core/helpers.js';
 import * as constants from '../../core/constants.js';
 import chalk from 'chalk';
 import {ListrLock} from '../../core/lock/listr-lock.js';
@@ -21,7 +21,6 @@ import {patchInject} from '../../core/dependency-injection/container-helper.js';
 import {type SoloLogger} from '../../core/logging/solo-logger.js';
 import {type ChartManager} from '../../core/chart-manager.js';
 import {type LockManager} from '../../core/lock/lock-manager.js';
-import {type Helm} from '../../core/helm.js';
 import {type ClusterChecks} from '../../core/cluster-checks.js';
 import {container} from 'tsyringe-neo';
 import {InjectTokens} from '../../core/dependency-injection/inject-tokens.js';
@@ -42,14 +41,12 @@ export class ClusterCommandTasks {
     @inject(InjectTokens.SoloLogger) private readonly logger: SoloLogger,
     @inject(InjectTokens.ChartManager) private readonly chartManager: ChartManager,
     @inject(InjectTokens.LockManager) private readonly leaseManager: LockManager,
-    @inject(InjectTokens.Helm) private readonly helm: Helm,
   ) {
     this.k8Factory = patchInject(k8Factory, InjectTokens.K8Factory, this.constructor.name);
     this.localConfig = patchInject(localConfig, InjectTokens.LocalConfig, this.constructor.name);
     this.logger = patchInject(logger, InjectTokens.SoloLogger, this.constructor.name);
     this.chartManager = patchInject(chartManager, InjectTokens.ChartManager, this.constructor.name);
     this.leaseManager = patchInject(leaseManager, InjectTokens.LockManager, this.constructor.name);
-    this.helm = patchInject(helm, InjectTokens.Helm, this.constructor.name);
   }
 
   public connectClusterRef(): SoloListrTask<ClusterRefConnectContext> {
@@ -114,16 +111,16 @@ export class ClusterCommandTasks {
   /**
    * Prepare values arg for cluster setup command
    *
-   * @param [chartDir] - local charts directory (default is empty)
+   * @param chartDirectory
    * @param [prometheusStackEnabled] - a bool to denote whether to install prometheus stack
    * @param [minioEnabled] - a bool to denote whether to install minio
    */
   private prepareValuesArg(
-    chartDir = flags.chartDirectory.definition.defaultValue as string,
+    chartDirectory = flags.chartDirectory.definition.defaultValue as string,
     prometheusStackEnabled = flags.deployPrometheusStack.definition.defaultValue as boolean,
     minioEnabled = flags.deployMinio.definition.defaultValue as boolean,
   ): string {
-    let valuesArg = chartDir ? `-f ${PathEx.join(chartDir, 'solo-cluster-setup', 'values.yaml')}` : '';
+    let valuesArg = chartDirectory ? `-f ${PathEx.join(chartDirectory, 'solo-cluster-setup', 'values.yaml')}` : '';
 
     valuesArg += ` --set cloud.prometheusStack.enabled=${prometheusStackEnabled}`;
     valuesArg += ` --set cloud.minio.enabled=${minioEnabled}`;
@@ -208,13 +205,6 @@ export class ClusterCommandTasks {
     return {
       title: 'Prepare chart values',
       task: async ctx => {
-        ctx.chartPath = await prepareChartPath(
-          this.helm,
-          ctx.config.chartDir,
-          constants.SOLO_TESTING_CHART_URL,
-          constants.SOLO_CLUSTER_SETUP_CHART,
-        );
-
         // if minio is already present, don't deploy it
         if (ctx.config.deployMinio && (await self.clusterChecks.isMinioInstalled(ctx.config.clusterSetupNamespace))) {
           ctx.config.deployMinio = false;
@@ -235,7 +225,7 @@ export class ClusterCommandTasks {
         }
 
         ctx.valuesArg = this.prepareValuesArg(
-          ctx.config.chartDir,
+          ctx.config.chartDirectory,
           ctx.config.deployPrometheusStack,
           ctx.config.deployMinio,
         );
@@ -254,11 +244,11 @@ export class ClusterCommandTasks {
         const valuesArg = ctx.valuesArg;
 
         try {
-          this.logger.debug(`Installing chart chartPath = ${ctx.chartPath}, version = ${version}`);
           await this.chartManager.install(
             clusterSetupNamespace,
             constants.SOLO_CLUSTER_SETUP_CHART,
-            ctx.chartPath,
+            constants.SOLO_CLUSTER_SETUP_CHART,
+            ctx.config.chartDirectory ? ctx.config.chartDirectory : constants.SOLO_TESTING_CHART_URL,
             version,
             valuesArg,
             ctx.config.context,

src/commands/cluster/tasks.ts

@@ -14,14 +14,14 @@ import {type AnyYargs, type ArgvStruct} from '../types/aliases.js';
 import {ListrLock} from '../core/lock/listr-lock.js';
 import {ComponentType} from '../core/config/remote/enumerations.js';
 import {MirrorNodeExplorerComponent} from '../core/config/remote/components/mirror-node-explorer-component.js';
-import {prepareChartPath, prepareValuesFiles, showVersionBanner} from '../core/helpers.js';
+import {prepareValuesFiles, showVersionBanner} from '../core/helpers.js';
 import {type Optional, type SoloListrTask} from '../types/index.js';
 import {resolveNamespaceFromDeployment} from '../core/resolvers.js';
 import {NamespaceName} from '../integration/kube/resources/namespace/namespace-name.js';
 import {type ClusterChecks} from '../core/cluster-checks.js';
 import {container, inject, injectable} from 'tsyringe-neo';
 import {InjectTokens} from '../core/dependency-injection/inject-tokens.js';
-import {INGRESS_CONTROLLER_NAME} from '../core/constants.js';
+import {HEDERA_EXPLORER_CHART_URL, INGRESS_CONTROLLER_NAME} from '../core/constants.js';
 import {INGRESS_CONTROLLER_VERSION} from '../../version.js';
 import {patchInject} from '../core/dependency-injection/container-helper.js';
 import * as helpers from '../core/helpers.js';
@@ -76,6 +76,7 @@ export class ExplorerCommand extends BaseCommand {
   private static readonly DEPLOY_FLAGS_LIST = {
     required: [],
     optional: [
+      flags.cacheDir,
       flags.chartDirectory,
       flags.clusterRef,
       flags.enableIngress,
@@ -232,14 +233,7 @@ export class ExplorerCommand extends BaseCommand {
           title: 'Install cert manager',
           task: async ctx => {
             const config = ctx.config;
-            const {chartDirectory, soloChartVersion} = config;
-
-            const chartPath = await prepareChartPath(
-              self.helm,
-              chartDirectory,
-              constants.SOLO_TESTING_CHART_URL,
-              constants.SOLO_CERT_MANAGER_CHART,
-            );
+            const {soloChartVersion} = config;
 
             const soloCertManagerValuesArg = await self.prepareCertManagerChartValuesArg(config);
             // check if CRDs of cert-manager are already installed
@@ -259,7 +253,8 @@ export class ExplorerCommand extends BaseCommand {
               await self.chartManager.install(
                 NamespaceName.of(constants.CERT_MANAGER_NAME_SPACE),
                 constants.SOLO_CERT_MANAGER_CHART,
-                chartPath,
+                constants.SOLO_CERT_MANAGER_CHART,
+                ctx.config.chartDirectory ? ctx.config.chartDirectory : constants.SOLO_TESTING_CHART_URL,
                 soloChartVersion,
                 '  --set cert-manager.installCRDs=true',
                 ctx.config.clusterContext,
@@ -287,7 +282,8 @@ export class ExplorerCommand extends BaseCommand {
             await self.chartManager.upgrade(
               NamespaceName.of(constants.CERT_MANAGER_NAME_SPACE),
               constants.SOLO_CERT_MANAGER_CHART,
-              chartPath,
+              constants.SOLO_CERT_MANAGER_CHART,
+              ctx.config.chartDirectory ? ctx.config.chartDirectory : constants.SOLO_TESTING_CHART_URL,
               soloChartVersion,
               soloCertManagerValuesArg,
               ctx.config.clusterContext,
@@ -308,7 +304,8 @@ export class ExplorerCommand extends BaseCommand {
             await self.chartManager.install(
               config.namespace,
               constants.HEDERA_EXPLORER_RELEASE_NAME,
-              constants.HEDERA_EXPLORER_CHART_URL,
+              '',
+              HEDERA_EXPLORER_CHART_URL,
               config.hederaExplorerVersion,
               exploreValuesArg,
               ctx.config.clusterContext,
@@ -328,17 +325,11 @@ export class ExplorerCommand extends BaseCommand {
             }
             explorerIngressControllerValuesArg += ` --set fullnameOverride=${constants.EXPLORER_INGRESS_CONTROLLER}`;
 
-            const ingressControllerChartPath = await prepareChartPath(
-              self.helm,
-              '', // don't use chartPath which is for local solo-charts only
-              constants.INGRESS_CONTROLLER_RELEASE_NAME,
-              constants.INGRESS_CONTROLLER_RELEASE_NAME,
-            );
-
             await self.chartManager.install(
               config.namespace,
               constants.INGRESS_CONTROLLER_RELEASE_NAME,
-              ingressControllerChartPath,
+              constants.INGRESS_CONTROLLER_RELEASE_NAME,
+              constants.INGRESS_CONTROLLER_RELEASE_NAME,
               INGRESS_CONTROLLER_VERSION,
               explorerIngressControllerValuesArg,
               ctx.config.clusterContext,