renamed node._nodeTlsKeyTaskList to node.taskGenerateTLSKeys, node._copyNodeKeys to copyNodeKeysToStaging

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

Author: jeromy-cannon

src/commands/node.mjs

@@ -329,7 +329,7 @@ export class NodeCommand extends BaseCommand {
    * @return a list of subtasks
    * @private
    */
-  // TODO: move to KeyManager and remove List2 functionality
+  // TODO: move to KeyManager
   taskGenerateGossipKeys (keyFormat, nodeIds, keysDir, curDate = new Date(), allNodeIds = null) {
     allNodeIds = allNodeIds || nodeIds
     if (!Array.isArray(nodeIds) || !nodeIds.every((nodeId) => typeof nodeId === 'string')) {
@@ -434,8 +434,8 @@ export class NodeCommand extends BaseCommand {
    * @return return a list of subtasks
    * @private
    */
-  // TODO move to KeyManager and remove List2 functionality
-  _nodeTlsKeyTaskList (nodeIds, keysDir, curDate = new Date()) {
+  // 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')
@@ -466,8 +466,8 @@ export class NodeCommand extends BaseCommand {
     return subTasks
   }
 
-  // TODO: move to KeyManager, rename copyNodeKeysToStaging
-  async _copyNodeKeys (nodeKey, destDir) {
+  // TODO: move to KeyManager
+  async copyNodeKeysToStaging (nodeKey, destDir) {
     for (const keyFile of [nodeKey.privateKeyFile, nodeKey.certificateFile]) {
       if (!fs.existsSync(keyFile)) {
         throw new FullstackTestingError(`file (${keyFile}) is missing`)
@@ -781,7 +781,7 @@ export class NodeCommand extends BaseCommand {
         title: 'Generate gRPC TLS keys',
         task: async (ctx, parentTask) => {
           const config = ctx.config
-          const subTasks = self._nodeTlsKeyTaskList(config.nodeIds, config.keysDir, config.curDate)
+          const subTasks = self.taskGenerateTLSKeys(config.nodeIds, config.keysDir, config.curDate)
           // set up the sub-tasks
           return parentTask.newListr(subTasks, {
             concurrent: false,
@@ -811,7 +811,7 @@ export class NodeCommand extends BaseCommand {
                 for (const nodeId of ctx.config.nodeIds) {
                   const config = /** @type {NodeSetupConfigClass} **/ ctx.config
                   const tlsKeyFiles = self.keyManager.prepareTLSKeyFilePaths(nodeId, config.keysDir)
-                  await self._copyNodeKeys(tlsKeyFiles, config.stagingKeysDir)
+                  await self.copyNodeKeysToStaging(tlsKeyFiles, config.stagingKeysDir)
                 }
               }
             }
@@ -1157,7 +1157,7 @@ export class NodeCommand extends BaseCommand {
         title: 'Generate gRPC TLS keys',
         task: async (ctx, parentTask) => {
           const config = ctx.config
-          const subTasks = self._nodeTlsKeyTaskList(config.nodeIds, config.keysDir, config.curDate)
+          const subTasks = self.taskGenerateTLSKeys(config.nodeIds, config.keysDir, config.curDate)
           // set up the sub-tasks
           return parentTask.newListr(subTasks, {
             concurrent: true,
@@ -1621,7 +1621,7 @@ export class NodeCommand extends BaseCommand {
         title: 'Generate gRPC TLS key',
         task: async (ctx, parentTask) => {
           const config = /** @type {NodeAddConfigClass} **/ ctx.config
-          const subTasks = self._nodeTlsKeyTaskList([config.nodeId], config.keysDir, config.curDate)
+          const subTasks = self.taskGenerateTLSKeys([config.nodeId], config.keysDir, config.curDate)
           // set up the sub-tasks
           return parentTask.newListr(subTasks, {
             concurrent: false,
@@ -1898,7 +1898,7 @@ export class NodeCommand extends BaseCommand {
                 const config = /** @type {NodeAddConfigClass} **/ ctx.config
                 for (const nodeId of config.allNodeIds) {
                   const tlsKeyFiles = self.keyManager.prepareTLSKeyFilePaths(nodeId, config.keysDir)
-                  await self._copyNodeKeys(tlsKeyFiles, config.stagingKeysDir)
+                  await self.copyNodeKeysToStaging(tlsKeyFiles, config.stagingKeysDir)
                 }
               }
             }
@@ -2161,11 +2161,11 @@ export class NodeCommand extends BaseCommand {
       switch (keyFormat) {
         case constants.KEY_FORMAT_PEM: {
           const signingKeyFiles = this.keyManager.prepareNodeKeyFilePaths(nodeId, keysDir, constants.SIGNING_KEY_PREFIX)
-          await this._copyNodeKeys(signingKeyFiles, stagingKeysDir)
+          await this.copyNodeKeysToStaging(signingKeyFiles, stagingKeysDir)
 
           // generate missing agreement keys
           const agreementKeyFiles = this.keyManager.prepareNodeKeyFilePaths(nodeId, keysDir, constants.AGREEMENT_KEY_PREFIX)
-          await this._copyNodeKeys(agreementKeyFiles, stagingKeysDir)
+          await this.copyNodeKeysToStaging(agreementKeyFiles, stagingKeysDir)
           break
         }