chore: remove unused keytool (#669)

Signed-off-by: Jeffrey Tang <jeffrey@swirldslabs.com>

Author: JeffreyDallas

README.md

@@ -76,6 +76,7 @@ Then run the following command to set the kubectl context to the new cluster:
 ```bash
 kind create cluster -n "${SOLO_CLUSTER_NAME}"
 ```
+
 Example output
 
 ```
@@ -96,7 +97,6 @@ Have a nice day! 👋
 
 You may now view pods in your cluster using `k9s -A` as below:
 
-
 ```
  Context: kind-solo                                <0> all   <a>       Attach       <ctr… ____  __.________
  Cluster: kind-solo                                          <ctrl-d>  Delete       <l>  |    |/ _/   __   \______
@@ -187,13 +187,16 @@ Kubernetes Namespace	: solo
 ✔ Generate gRPC TLS keys
 ✔ Finalize
 ```
+
 PEM key files are generated in `~/.solo/keys` directory.
+
 ```
 hedera-node1.crt    hedera-node3.crt    s-private-node1.pem s-public-node1.pem  unused-gossip-pem
 hedera-node1.key    hedera-node3.key    s-private-node2.pem s-public-node2.pem  unused-tls
 hedera-node2.crt    hedera-node4.crt    s-private-node3.pem s-public-node3.pem
 hedera-node2.key    hedera-node4.key    s-private-node4.pem s-public-node4.pem
 ```
+
 * Setup cluster with shared components
 
 ```
@@ -486,6 +489,7 @@ To set customized `settings.txt` file, edit the file
 `~/.solo/cache/templates/settings.txt` after `solo init` command.
 
 Then you can start customized built hedera network with the following command:
+
 ```
 solo node setup --local-build-path <default path to hedera repo>,node1=<custom build hedera repo>,node2=<custom build repo>
 
@@ -495,12 +499,15 @@ solo node setup --local-build-path <default path to hedera repo>,node1=<custom b
 ## For Developers Working on Platform core
 
 To deploy node with local build PTT jar files, run the following command:
+
 ```
 solo node setup --local-build-path <default path to hedera repo>,node1=<custom build hedera repo>,node2=<custom build repo> --app PlatformTestingTool.jar --app-config <path-to-test-json1,path-to-test-json2>
 
 # example: solo node setup --local-build-path ../hedera-services/platform-sdk/sdk/data,node1=../hedera-services/platform-sdk/sdk/data,node2=../hedera-services/platform-sdk/sdk/data --app PlatformTestingTool.jar --app-config ../hedera-services/platform-sdk/platform-apps/tests/PlatformTestingTool/src/main/resources/FCMFCQ-Basic-2.5k-5m.json
 ```
+
 ## Logs
+
 You can find log for running solo command under the directory `~/.solo/logs/`
 The file `solo.log` contains the logs for the solo command.
 The file `hashgraph-sdk.log` contains the logs from Solo client when sending transactions to network nodes.
@@ -510,6 +517,7 @@ The file `hashgraph-sdk.log` contains the logs from Solo client when sending tra
 NOTE: the hedera-services path referenced '../hedera-services/hedera-node/data' may need to be updated based on what directory you are currently in.  This also assumes that you have done an assemble/build and the directory contents are up-to-date.
 
 Example 1: attach jvm debugger to a hedera node
+
 ```bash
 ./test/e2e/setup-e2e.sh
 solo node keys --gossip-keys --tls-keys

src/commands/node.mjs

@@ -63,7 +63,7 @@ import { downloadGeneratedFilesConfigBuilder, prepareUpgradeConfigBuilder } from
 export class NodeCommand extends BaseCommand {
   /**
    * @param {{logger: SoloLogger, helm: Helm, k8: K8, chartManager: ChartManager, configManager: ConfigManager,
-   * depManager: DependencyManager, keytoolDepManager: KeytoolDependencyManager, downloader: PackageDownloader,
+   * depManager: DependencyManager, downloader: PackageDownloader,
    * platformInstaller: PlatformInstaller, keyManager: KeyManager, accountManager: AccountManager,
    * profileManager: ProfileManager}} opts
    */
@@ -74,14 +74,12 @@ export class NodeCommand extends BaseCommand {
     if (!opts || !opts.platformInstaller) throw new IllegalArgumentError('An instance of core/PlatformInstaller is required', opts.platformInstaller)
     if (!opts || !opts.keyManager) throw new IllegalArgumentError('An instance of core/KeyManager is required', opts.keyManager)
     if (!opts || !opts.accountManager) throw new IllegalArgumentError('An instance of core/AccountManager is required', opts.accountManager)
-    if (!opts || !opts.keytoolDepManager) throw new IllegalArgumentError('An instance of KeytoolDependencyManager is required', opts.keytoolDepManager)
     if (!opts || !opts.profileManager) throw new IllegalArgumentError('An instance of ProfileManager is required', opts.profileManager)
 
     this.downloader = opts.downloader
     this.platformInstaller = opts.platformInstaller
     this.keyManager = opts.keyManager
     this.accountManager = opts.accountManager
-    this.keytoolDepManager = opts.keytoolDepManager
     this.profileManager = opts.profileManager
     this._portForwards = []
 
@@ -1255,7 +1253,7 @@ export class NodeCommand extends BaseCommand {
         title: 'Generate gossip keys',
         task: (ctx, parentTask) => {
           const config = ctx.config
-          const subTasks = self.keyManager.taskGenerateGossipKeys(self.keytoolDepManager, config.nodeAliases, config.keysDir, config.curDate)
+          const subTasks = self.keyManager.taskGenerateGossipKeys(config.nodeAliases, config.keysDir, config.curDate)
           // set up the sub-tasks
           return parentTask.newListr(subTasks, {
             concurrent: false,
@@ -1651,7 +1649,7 @@ export class NodeCommand extends BaseCommand {
         title: 'Generate Gossip key',
         task: (ctx, parentTask) => {
           const config = /** @type {NodeAddConfigClass} **/ ctx.config
-          const subTasks = self.keyManager.taskGenerateGossipKeys(self.keytoolDepManager, [config.nodeAlias], config.keysDir, config.curDate, config.allNodeAliases) // 666
+          const subTasks = self.keyManager.taskGenerateGossipKeys([config.nodeAlias], config.keysDir, config.curDate, config.allNodeAliases) // 666
           // set up the sub-tasks
           return parentTask.newListr(subTasks, {
             concurrent: false,

src/core/constants.mjs

@@ -28,7 +28,6 @@ export const SOLO_CACHE_DIR = path.join(SOLO_HOME_DIR, 'cache')
 export const SOLO_VALUES_DIR = path.join(SOLO_CACHE_DIR, 'values-files')
 export const DEFAULT_NAMESPACE = 'default'
 export const HELM = 'helm'
-export const KEYTOOL = 'keytool'
 export const SOLO_CONFIG_FILE = path.join(SOLO_HOME_DIR, 'solo.yaml')
 export const RESOURCES_DIR = normalize(path.join(CUR_FILE_DIR, '..', '..', 'resources'))
 export const TEMP_DIR = normalize(path.join(CUR_FILE_DIR, '..', '..', 'temp'))

src/core/dependency_managers/index.mjs

@@ -16,6 +16,5 @@
  */
 import { DependencyManager } from './dependency_manager.mjs'
 import { HelmDependencyManager } from './helm_dependency_manager.mjs'
-import { KeytoolDependencyManager } from './keytool_dependency_manager.mjs'
 
-export { HelmDependencyManager, KeytoolDependencyManager, DependencyManager }
+export { HelmDependencyManager, DependencyManager }

src/core/dependency_managers/keytool_dependency_manager.mjs

@@ -25,7 +25,6 @@ import { Templates } from './templates.mjs'
 import { ChartManager } from './chart_manager.mjs'
 import { ConfigManager } from './config_manager.mjs'
 import { KeyManager } from './key_manager.mjs'
-import { Keytool } from './keytool.mjs'
 import { ProfileManager } from './profile_manager.mjs'
 import { YargsCommand } from './yargs_command.mjs'
 import { Task } from './task.mjs'
@@ -45,7 +44,6 @@ export {
   ChartManager,
   ConfigManager,
   KeyManager,
-  Keytool,
   ProfileManager,
   YargsCommand,
   Task

src/core/index.mjs

@@ -521,15 +521,14 @@ export class KeyManager {
    *
    * WARNING: These tasks MUST run in sequence.
    *
-   * @param {KeytoolDependencyManager} keytoolDepManager - an instance of core/KeytoolDepManager
    * @param {NodeAliases} nodeAliases
    * @param {string} keysDir - keys directory
    * @param {Date} curDate - current date
    * @param {NodeAliases|null} [allNodeAliases] - includes the nodeAliases to get new keys as well as existing nodeAliases that will be included in the public.pfx file
    * @return {Object[]} a list of subtasks
    * @public
    */
-  taskGenerateGossipKeys (keytoolDepManager, nodeAliases, keysDir, curDate = new Date(), allNodeAliases = null) {
+  taskGenerateGossipKeys (nodeAliases, keysDir, curDate = new Date(), allNodeAliases = null) {
     allNodeAliases = allNodeAliases || nodeAliases
     if (!Array.isArray(nodeAliases) || !nodeAliases.every((nodeAlias) => typeof nodeAlias === 'string')) {
       throw new IllegalArgumentError('nodeAliases must be an array of strings, nodeAliases = ' + JSON.stringify(nodeAliases))