moved copyNodeKeysToStaging from node.mjs to key_manager.mjs

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

Author: jeromy-cannon

src/commands/node.mjs

@@ -457,17 +457,6 @@ export class NodeCommand extends BaseCommand {
   }
 
   // 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`)
-      }
-
-      const fileName = path.basename(keyFile)
-      fs.cpSync(keyFile, path.join(destDir, fileName))
-    }
-  }
-
   async initializeSetup (config, k8) {
     // compute other config parameters
     config.keysDir = path.join(validatePath(config.cacheDir), 'keys')
@@ -801,7 +790,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.copyNodeKeysToStaging(tlsKeyFiles, config.stagingKeysDir)
+                  await self.keyManager.copyNodeKeysToStaging(tlsKeyFiles, config.stagingKeysDir)
                 }
               }
             }
@@ -1888,7 +1877,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.copyNodeKeysToStaging(tlsKeyFiles, config.stagingKeysDir)
+                  await self.keyManager.copyNodeKeysToStaging(tlsKeyFiles, config.stagingKeysDir)
                 }
               }
             }
@@ -2151,11 +2140,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.copyNodeKeysToStaging(signingKeyFiles, stagingKeysDir)
+          await this.keyManager.copyNodeKeysToStaging(signingKeyFiles, stagingKeysDir)
 
           // generate missing agreement keys
           const agreementKeyFiles = this.keyManager.prepareNodeKeyFilePaths(nodeId, keysDir, constants.AGREEMENT_KEY_PREFIX)
-          await this.copyNodeKeysToStaging(agreementKeyFiles, stagingKeysDir)
+          await this.keyManager.copyNodeKeysToStaging(agreementKeyFiles, stagingKeysDir)
           break
         }
 

src/core/key_manager.mjs

@@ -666,4 +666,15 @@ export class KeyManager {
 
     return publicPfxFile
   }
+
+  async copyNodeKeysToStaging (nodeKey, destDir) {
+    for (const keyFile of [nodeKey.privateKeyFile, nodeKey.certificateFile]) {
+      if (!fs.existsSync(keyFile)) {
+        throw new FullstackTestingError(`file (${keyFile}) is missing`)
+      }
+
+      const fileName = path.basename(keyFile)
+      fs.cpSync(keyFile, path.join(destDir, fileName))
+    }
+  }
 }