moved taskGenerateTLSKeys from node.mjs to key_manager.mjs

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

src/commands/node.mjs

@@ -315,49 +315,6 @@ export class NodeCommand extends BaseCommand {
     })
   }
 
-  /**
-   *  Return a list of subtasks to generate gRPC TLS keys
-   *
-   * WARNING: These tasks should run in sequence
-   *
-   * @param nodeIds node ids
-   * @param keysDir keys directory
-   * @param curDate current date
-   * @return return a list of subtasks
-   * @private
-   */
-  // TODO move to KeyManager
-  taskGenerateTLSKeys (nodeIds, keysDir, curDate = new Date()) {
-    // check if nodeIds is an array of strings
-    if (!Array.isArray(nodeIds) || !nodeIds.every((nodeId) => typeof nodeId === 'string')) {
-      throw new FullstackTestingError('nodeIds must be an array of strings')
-    }
-    const self = this
-    const nodeKeyFiles = new Map()
-    const subTasks = []
-
-    subTasks.push({
-      title: 'Backup old files',
-      task: () => helpers.backupOldTlsKeys(nodeIds, keysDir, curDate)
-    }
-    )
-
-    for (const nodeId of nodeIds) {
-      subTasks.push({
-        title: `TLS key for node: ${chalk.yellow(nodeId)}`,
-        task: async () => {
-          const tlsKey = await self.keyManager.generateGrpcTLSKey(nodeId)
-          const tlsKeyFiles = await self.keyManager.storeTLSKey(nodeId, tlsKey, keysDir)
-          nodeKeyFiles.set(nodeId, {
-            tlsKeyFiles
-          })
-        }
-      })
-    }
-
-    return subTasks
-  }
-
   // TODO: duplicate into network deploy
   async initializeSetup (config, k8) {
     // compute other config parameters
@@ -662,7 +619,7 @@ export class NodeCommand extends BaseCommand {
         title: 'Generate gRPC TLS keys',
         task: async (ctx, parentTask) => {
           const config = ctx.config
-          const subTasks = self.taskGenerateTLSKeys(config.nodeIds, config.keysDir, config.curDate)
+          const subTasks = self.keyManager.taskGenerateTLSKeys(config.nodeIds, config.keysDir, config.curDate)
           // set up the sub-tasks
           return parentTask.newListr(subTasks, {
             concurrent: false,
@@ -1038,7 +995,7 @@ export class NodeCommand extends BaseCommand {
         title: 'Generate gRPC TLS keys',
         task: async (ctx, parentTask) => {
           const config = ctx.config
-          const subTasks = self.taskGenerateTLSKeys(config.nodeIds, config.keysDir, config.curDate)
+          const subTasks = self.keyManager.taskGenerateTLSKeys(config.nodeIds, config.keysDir, config.curDate)
           // set up the sub-tasks
           return parentTask.newListr(subTasks, {
             concurrent: true,
@@ -1502,7 +1459,7 @@ export class NodeCommand extends BaseCommand {
         title: 'Generate gRPC TLS key',
         task: async (ctx, parentTask) => {
           const config = /** @type {NodeAddConfigClass} **/ ctx.config
-          const subTasks = self.taskGenerateTLSKeys([config.nodeId], config.keysDir, config.curDate)
+          const subTasks = self.keyManager.taskGenerateTLSKeys([config.nodeId], config.keysDir, config.curDate)
           // set up the sub-tasks
           return parentTask.newListr(subTasks, {
             concurrent: false,

src/core/key_manager.mjs

@@ -807,4 +807,46 @@ export class KeyManager {
 
     return subTasks
   }
+
+  /**
+   *  Return a list of subtasks to generate gRPC TLS keys
+   *
+   * WARNING: These tasks should run in sequence
+   *
+   * @param nodeIds node ids
+   * @param keysDir keys directory
+   * @param curDate current date
+   * @return return a list of subtasks
+   * @private
+   */
+  taskGenerateTLSKeys (nodeIds, keysDir, curDate = new Date()) {
+    // check if nodeIds is an array of strings
+    if (!Array.isArray(nodeIds) || !nodeIds.every((nodeId) => typeof nodeId === 'string')) {
+      throw new FullstackTestingError('nodeIds must be an array of strings')
+    }
+    const self = this
+    const nodeKeyFiles = new Map()
+    const subTasks = []
+
+    subTasks.push({
+      title: 'Backup old files',
+      task: () => helpers.backupOldTlsKeys(nodeIds, keysDir, curDate)
+    }
+    )
+
+    for (const nodeId of nodeIds) {
+      subTasks.push({
+        title: `TLS key for node: ${chalk.yellow(nodeId)}`,
+        task: async () => {
+          const tlsKey = await self.generateGrpcTLSKey(nodeId)
+          const tlsKeyFiles = await self.storeTLSKey(nodeId, tlsKey, keysDir)
+          nodeKeyFiles.set(nodeId, {
+            tlsKeyFiles
+          })
+        }
+      })
+    }
+
+    return subTasks
+  }
 }