cob-cli 2.52.0-beta-1 → 2.52.0

package/bin/cob-cli.js

@@ -10,10 +10,7 @@ const init             = require("../lib/commands/init");
 const customize        = require("../lib/commands/customize");
 const test             = require("../lib/commands/test");
 const deploy           = require("../lib/commands/deploy");
-const cleanup          = require("../lib/commands/cleanup");
-const package          = require("../lib/commands/package");
 const updateFromServer = require("../lib/commands/updateFromServer");
-const tagDefs          = require("../lib/commands/tagDefs.js");
 const getDefs          = require("../lib/commands/getDefs");
 const generateMermaid  = require("../lib/commands/generateMermaid");
 const { upgradeRepo }  = require("../lib/commands/upgradeRepo");
@@ -76,30 +73,12 @@ program
     .description('Deploy customization to the server')
     .action( deploy );
 
-program
-    .command('cleanup')
-    .option('-e --environment <name>', 'environment to use')
-    .option('-s --servername <servername>', 'use <servername>.cultofbits.pt (i.e. name without the FQDN)')
-    .option('-l --localOnly', 'only clean local state, skip server cleanup')
-    .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
-    .description('Clean up repository state after an interrupted test or deploy')
-    .action( cleanup );
-
-program
-    .command('package')
-    .option('-e --environment <name>', 'environment to use')
-    .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
-    .description('Package customization for out-of-band deploying')
-    .action( package );
-
 program
     .command('updateFromServer')
     .description('Updates local copy with current files on server, in case of changes made out of standard process.')
     .option('-e --environment <name>', 'environment to use')
     .option('-s --servername <servername>', 'use <servername>.cultofbits.pt (i.e. name without the FQDN)')
     .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
-    .option('-c --code', 'By adding this flag you indicate that you want to bring the code and not the data')
-    .option('--cookie <path>', '')
     .action( updateFromServer );
 
 program
@@ -112,16 +91,6 @@ program
     .option('-e --environment <name>', 'environment to use')
     .description('Updates local copy with definitions on server')
     .action( getDefs );
-
-program
-    .command('tagDefs')
-    .description('Allows the user to tag un-tagged Changes in Definitions configured on exported solutions.')
-    .option('-e --environment <name>', 'environment to use')
-    .option('-s --servername <servername>', 'use <servername>.cultofbits.pt (i.e. name without the FQDN)')
-    .option('-V --verbose', 'verbose execution of tasks', increaseVerbosity, 0)
-    .option('--all', 'tag all Definitions of all exported solutions. Use with care!')
-    .option('--cookie <path>', '')
-    .action( tagDefs );
     
 program
     .command('generateMermaid')

package/lib/commands/deploy.js

@@ -4,47 +4,40 @@ const { confirmExecutionOfChanges } = require("../task_lists/common_syncFiles");
 const { validateDeployConditions } = require("../task_lists/deploy_validate");
 const { executeTasks } = require("../task_lists/deploy_execute");
 const { checkRepoVersion } = require("../commands/upgradeRepo");
-const { saveOperationState, clearOperationState, checkNoInterruptedRun } = require("../task_lists/common_operationState");
 
 async function deploy(args) {
-    checkRepoVersion()
-    const cmdEnv = await getCurrentCommandEnviroment(args)
-    await checkNoInterruptedRun()
-    saveOperationState(cmdEnv.name, cmdEnv.servername)
-    if(args.resync) args.force = true;
+    try {
+        checkRepoVersion()
+        const cmdEnv = await getCurrentCommandEnviroment(args)
+        if(args.resync) args.force = true;
 
-    console.log(`Checking conditions to deploy ${cmdEnv.branchStr} to ${cmdEnv.serverStr}...` );
+        console.log(`Checking conditions to deploy ${cmdEnv.branchStr} to ${cmdEnv.serverStr}...` );
 
-    try {
         await validateDeployConditions(cmdEnv,args).run()
-    } catch (err) {
-        // we should clear the operation state
-        clearOperationState();
-        throw err
-    }
-
-    await cmdEnv.applyCurrentCommandEnvironmentChanges()
-    let changes = [];
-    try {
-        changes = await confirmExecutionOfChanges(cmdEnv)
-    } catch (err) {
-        await cmdEnv.unApplyCurrentCommandEnvironmentChanges()
-        clearOperationState()
-        throw err
-    }
 
-    if(changes.length == 0) {
-        if(!args.force) {
+        await cmdEnv.applyCurrentCommandEnvironmentChanges()
+        let changes = [];
+        try {
+            changes = await confirmExecutionOfChanges(cmdEnv)
+        } catch (err) {
             await cmdEnv.unApplyCurrentCommandEnvironmentChanges()
-            clearOperationState()
-            throw new Error("Canceled:".yellow + " nothing todo\n")
+            throw err
+        }
+
+        if(changes.length == 0) {
+            if(!args.force) {
+                await cmdEnv.unApplyCurrentCommandEnvironmentChanges()
+                throw new Error("Canceled:".yellow + " nothing todo\n")
+            }
+            console.log(" Just updating deploy information.")
         }
-        console.log(" Just updating deploy information.")
-    }
 
-    await executeTasks(cmdEnv, args).run();
+        await executeTasks(cmdEnv, args).run();
 
-    clearOperationState()
-    console.log("\nDone!".green, "\nEnjoy!")
+        console.log("\nDone!".green, "\nEnjoy!")
+
+    } catch(err) {
+        console.error("\n",err.message);
+    }
 }
-module.exports = deploy;
+module.exports = deploy;

package/lib/commands/test.js

@@ -6,33 +6,19 @@ const { otherFilesContiousReload } = require("../task_lists/test_otherFilesConti
 const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
 const { getKeypress } = require("../task_lists/common_helpers");
 const { checkRepoVersion } = require("../commands/upgradeRepo");
-const { saveOperationState, clearOperationState, checkNoInterruptedRun } = require("../task_lists/common_operationState");
 
-async function test (args) {
+async function test (args) {    
     let restoreChanges, error = "";
     let cmdEnv
     let spawned
-    let stateSaved = false
-    let envChangesApplied = false
-
-    let rejectOnSignal;
-    const signalPromise = new Promise((_, reject) => { rejectOnSignal = reject; });
-    const handleSignal = () => rejectOnSignal(new Error('signal'));
-    process.once('SIGTERM', handleSignal);
-    process.once('SIGHUP', handleSignal);
-
     try {
         checkRepoVersion()
         console.log("Start testing… ")
         cmdEnv = await getCurrentCommandEnviroment(args)
-        await checkNoInterruptedRun()
-        saveOperationState(cmdEnv.name, cmdEnv.servername)
-        stateSaved = true
 
         if(!args.localOnly) {
-            await validateTestingConditions(cmdEnv, args)
+            await validateTestingConditions(cmdEnv, args) 
             await cmdEnv.applyCurrentCommandEnvironmentChanges()
-            envChangesApplied = true
             restoreChanges = await otherFilesContiousReload(cmdEnv)
         } else {
             await cmdEnv.applyCurrentCommandEnvironmentChanges()
@@ -41,22 +27,16 @@ async function test (args) {
 
         let key;
         do {
-            key = await Promise.race([getKeypress(), signalPromise, spawned.failed]);
-            if(key == "o") opn(`http://localhost:${spawned.port}/recordm/index.html`)
-        } while( key != "q" && key != "ctrl+c" )
+            key = await getKeypress()
+            if(key == "o") opn("http://localhost:8040/recordm/index.html")
+        } while( key != "q" && key != "ctrl+c" ) 
 
-    } catch (err) {
-        if(err.message !== 'signal' && err.message !== 'processes-failed') {
-            error = err.message
-            console.log("\n",error)
-        }
+    } catch (err) { 
+        error = err.message
+        console.log("\n",error)
     } finally {
-        process.off('SIGTERM', handleSignal);
-        process.off('SIGHUP', handleSignal);
-        try { process.stdin.setRawMode(false); } catch {}
         restoreChanges && await restoreChanges()
-        envChangesApplied && cmdEnv && await cmdEnv.unApplyCurrentCommandEnvironmentChanges() // Repõe as configurações
-        if (stateSaved) clearOperationState()
+        cmdEnv && await cmdEnv.unApplyCurrentCommandEnvironmentChanges() // Repõe as configurações
         spawned && await spawned.stop();
         // Dá tempo aos subprocessos para morrer (acho que já não é preciso)
         setTimeout(() => {

package/lib/commands/updateFromServer.js

@@ -1,167 +1,31 @@
 require('colors');
 const { getCurrentCommandEnviroment } = require("../task_lists/common_enviromentHandler");
 const { copyFiles } = require("../task_lists/common_syncFiles");
-const { promptCredentials, readYamlFile } = require("../task_lists/common_helpers.js");
 const { validateUpdateFromServerConditions } = require("../task_lists/updateFromServer_validate");
-const { getGroupsFromServer } = require("../task_lists/updateFromServer_groups");
-const { getDefinitionsFromServer } = require("../task_lists/updateFromServer_definitions");
-const { getInstancesFromServer } = require("../task_lists/updateFromServer_instances");
-const { getKibanaFromServer } = require("../task_lists/updateFromServer_kibana");
-const { getDomainsFromServer } = require("../task_lists/updateFromServer_domains");
 const { checkRepoVersion } = require("../commands/upgradeRepo");
-const axios = require('axios');
-const tough = require('tough-cookie');
-const fs = require("fs/promises");
-const axiosCookieJarSupport = require('axios-cookiejar-support')
-const path = require('path')
-const FileCookieStore = require('file-cookie-store');
 
 async function updateFromServer(args) {
     try {
         checkRepoVersion()
         const cmdEnv = await getCurrentCommandEnviroment(args)
 
-        if (args.code) {
+        await validateUpdateFromServerConditions(cmdEnv).run()
 
-            await validateUpdateFromServerConditions(cmdEnv).run()
+        console.log("\nOk to proceed. Getting files from server's live directories...");
+        await cmdEnv.applyCurrentCommandEnvironmentChanges()
+        let changes = await copyFiles(cmdEnv, "serverLive", "localCopy", args) 
+        await cmdEnv.unApplyCurrentCommandEnvironmentChanges()
 
-            console.log("\nOk to proceed. Getting files from server's live directories...");
-            await cmdEnv.applyCurrentCommandEnvironmentChanges()
-            let changes = await copyFiles(cmdEnv, "serverLive", "localCopy", args)
-            await cmdEnv.unApplyCurrentCommandEnvironmentChanges()
-
-            if (changes.length == 0) {
-                console.log("\nFinished.".green, "Nothing todo, no changes detected.");
-            } else {
-                console.log("\n " + changes.join("\n "));
-                console.log("\nUpdate done!".yellow, "Check", "git status".bold.blue, "and", "git diff".bold.blue, "to see the resulting differences.");
-                console.log("Notice that", "any changes since last deploy migth be lost.".underline)
-                console.log("Notice also that you will need to do a", "cob-cli deploy --force".bold.blue, "on next deploy.")
-            }
+        if(changes.length == 0) {
+            console.log("\nFinished.".green,"Nothing todo, no changes detected.");
         } else {
-
-            axiosCookieJarSupport.wrapper(axios)
-            axios.defaults.ignoreCookieErrors = true
-            axios.defaults.withCredentials = true
-            const cookieJar = new tough.CookieJar()
-            axios.defaults.jar = cookieJar
-
-            if( args.cookie ) {
-                const p = path.resolve(args.cookie);
-                const cookieFile = new FileCookieStore(p, {auto_sync: false, force_parse: true});
-                try{
-                    let c = await new Promise((resolve, reject) => {
-                        cookieFile.findCookie(`${cmdEnv.servername}.cultofbits.com`, '/', 'cobtoken', (err, result) => {
-                            if(err != null) reject(err);
-                            else resolve(result)
-                        })
-                    });
-                    if(!c){
-                        throw Error( `couldn't find a cookie for ${cmdEnv.servername} in ${p}`)
-                    }
-                    cookieJar.setCookie(c.toString(), `https://${cmdEnv.servername}.cultofbits.com`)
-                } catch(e){
-                    console.error(e)
-                    return
-                }
-
-            } else {
-                const credentials = await promptCredentials()
-                await axios.post(`https://${cmdEnv.servername}.cultofbits.com/recordm/security/auth`, credentials, {
-                    headers: {
-                        "Content-Type": "application/json",
-                    },
-                })
-            }
-
-            console.log("\n Removing existing Data")
-            try{ await fs.access("others/solutionsData") } catch { await fs.mkdir("others/solutionsData") }
-            const dataFiles = await fs.readdir("others/solutionsData");
-            for (const file of dataFiles) {
-                const filePath = path.join("others/solutionsData", file);
-                await fs.rm(filePath, {recursive: true, force: true} )
-            }
-
-            const solutions = await readYamlFile("solutions.yml")
-
-            for (const solution of solutions) {
-
-                console.log("\nStarting updateFromServer of solution " + solution.name)
-
-                const dataPath = `others/solutionsData/${solution.name}`
-                fs.mkdir(dataPath, { recursive: true })
-
-                if (solution.permissions) {
-                    await getGroupsFromServer(
-                        cmdEnv.servername,
-                        solution.groups,
-                        dataPath + "/permissions.json",
-                        solution.name,
-                        args
-                    )
-                }
-
-                if (solution.definitions) {
-                    const definitionPath = dataPath + '/definitions/'
-                    fs.mkdir(definitionPath, { recursive: true })
-                    const viewsPath = dataPath + '/views/'
-                    fs.mkdir(viewsPath, { recursive: true })
-                    await getDefinitionsFromServer(
-                        cmdEnv.servername,
-                        solution.definitions,
-                        definitionPath,
-                        viewsPath,
-                        solution.name,
-                        args
-                    ).run()
-                }
-
-                if (solution.instances) {
-                    const instancesPath = dataPath + '/instances/'
-                    fs.mkdir(instancesPath, { recursive: true })
-                    await getInstancesFromServer(
-                        cmdEnv.servername,
-                        solution.instances,
-                        instancesPath,
-                        solution.name,
-                        args
-                    )
-                }
-
-                if(solution.kibana){
-                    const kibanaPath = dataPath + '/kibana/'
-                    fs.mkdir(kibanaPath, { recursive: true })
-                    await getKibanaFromServer(
-                        cmdEnv.servername,
-                        solution.kibana.spaces,
-                        kibanaPath,
-                        solution.name,
-                        args
-                    )
-                }
-
-                if(solution.domains){
-                    const domainsPath = dataPath + '/domains/'
-                    fs.mkdir(domainsPath, { recursive: true })
-                    await getDomainsFromServer(
-                        cmdEnv.servername,
-                        solution.domains.filter,
-                        domainsPath,
-                        solution.name,
-                        args
-                    )
-                }
-
-            }
-
-            await fs.writeFile('others/solutionsData/_index', solutions.map(c => c.name).join('\n'), 'utf-8')
+            console.log("\n " + changes.join("\n "));
+            console.log("\nUpdate done!".yellow,"Check","git status".bold.blue,"and","git diff".bold.blue,"to see the resulting differences.");
+            console.log("Notice that","any changes since last deploy migth be lost.".underline)
+            console.log("Notice also that you will need to do a","cob-cli deploy --force".bold.blue,"on next deploy.")
         }
-
-
-    } catch (err) {
-        console.error("\n", err.message);
+    } catch(err) {
+        console.error("\n",err.message);
     }
 }
-
-
 module.exports = updateFromServer;

package/lib/task_lists/common_enviromentHandler.js

@@ -5,7 +5,6 @@ const git = require('simple-git');
 const fs = require('fs-extra');
 const { getCurrentBranch } = require("./common_releaseManager");
 const { SERVER_COB_CLI_DIRECTORY } = require("./common_helpers")
-const { getSshArgs } = require("./common_helpers")
 
 const SERVER_LAST_ENV_FILE = SERVER_COB_CLI_DIRECTORY + "lastDeployEnv";
 
@@ -67,7 +66,7 @@ exports.getCurrentCommandEnviroment = getCurrentCommandEnviroment;
 
 /* ************************************ */
 async function _applySpecific(environmentName) {
-    const envSpecificFiles = await fg(['**/*.ENV__'+ environmentName +'__.*'], { onlyFiles: false, dot: true });
+    const envSpecificFiles = await fg(['**/*.ENV__'+ environmentName +'__.*'], { onlyFiles: false, dot: true });    
 
     for( let envSpecificFile of envSpecificFiles ) {
         let prodFile   = envSpecificFile.replace(/\.ENV__.*__/,"")
@@ -75,7 +74,7 @@ async function _applySpecific(environmentName) {
         if(!fs.existsSync(deleteFile)) {
             if(fs.existsSync(prodFile)) {
                 let backupFile = envSpecificFile.replace(/\.ENV__.*__/,".ENV__ORIGINAL_BACKUP__")
-                await git().raw(["update-index","--assume-unchanged", prodFile]).catch(() => {})
+                await git().raw(["update-index","--assume-unchanged", prodFile])
                 fs.renameSync(prodFile, backupFile)
             } else {
                 fs.appendFileSync('.git/info/exclude', "\n" + prodFile)
@@ -83,7 +82,7 @@ async function _applySpecific(environmentName) {
             }
         }
         fs.renameSync(envSpecificFile, prodFile)
-        await git().raw(["update-index","--assume-unchanged", envSpecificFile]).catch(() => {})
+        await git().raw(["update-index","--assume-unchanged", envSpecificFile])
     }
 }
 
@@ -95,11 +94,11 @@ async function _undoSpecific(environmentName) {
         let prodFile = changedFile.replace(/\.ENV__.*__/,"")
         let originalEnvSpecificFile = changedFile.replace(/\.ENV__.*__/,'.ENV__' + environmentName + '__')
         fs.renameSync(prodFile, originalEnvSpecificFile)
-        await git().raw(["update-index","--no-assume-unchanged", originalEnvSpecificFile]).catch(() => {})
-
+        await git().raw(["update-index","--no-assume-unchanged", originalEnvSpecificFile])
+        
         if( changedFile.indexOf("\.ENV__ORIGINAL_BACKUP__") > 0 ) {
             fs.renameSync(changedFile, prodFile)
-            await git().raw(["update-index","--no-assume-unchanged", prodFile]).catch(() => {})
+            await git().raw(["update-index","--no-assume-unchanged", prodFile])
         }
         if( changedFile.indexOf("\.ENV__DELETE__")  > 0 ) {
             flagDeleteExclude = true
@@ -121,8 +120,6 @@ function _getDefaultServerForEnvironment(environmentName) {
 
 /* ************************************ */
 function _getServerSSHFQDN(servername) {
-    // return IPs as-is
-    if (servername.includes(".")) return servername;
     return servername + ".cultofbits.pt";
 }
 
@@ -134,19 +131,16 @@ function _getServerHTTPsFQDN(servername) {
 /* ************************************ */
 async function _getLastEnvironmentDeployed(server) {
     try {
-        let result = await execa('ssh', [...getSshArgs(server), "cat " + SERVER_LAST_ENV_FILE ]);
+        let result = await execa('ssh', [server, "cat " + SERVER_LAST_ENV_FILE ]);
         return result.stdout;
     } catch (error) {
-        if (error.exitCode === 255) {
-            throw new Error(`SSH connection to '${server}' failed: ${error.shortMessage}`);
-        }
         return "prod"
     }
 }
 
 /* ************************************ */
 async function _setLastEnvironmentDeployed(server, environmentName) {
-    await execa('ssh', [...getSshArgs(server), "echo '" + environmentName + "' > " + SERVER_LAST_ENV_FILE ]);
+    await execa('ssh', [server, "echo '" + environmentName + "' > " + SERVER_LAST_ENV_FILE ]);
 }
 
 /* ************************************ */

package/lib/task_lists/common_helpers.js

@@ -1,43 +1,5 @@
-const inquirer = require("inquirer")
-const readline = require('readline');
-const yaml = require('js-yaml');
-const fs = require("fs/promises");
-const { getSshArgs } = require("./ssh");
-
 const SERVER_COB_CLI_DIRECTORY = "/opt/cob-cli/";
 
-/* ************************************ */
-function getSshArgs(server) {
-    const args = [
-        "-o", "StrictHostKeyChecking=no",
-        "-o", "PreferredAuthentications=publickey",
-        "-o", "BatchMode=yes",
-    ];
-
-    if (process.env.COB_SSH_PORT)     args.push("-p", process.env.COB_SSH_PORT);
-    if (process.env.COB_SSH_IDENTITY) args.push("-i", process.env.COB_SSH_IDENTITY);
-
-    const target = process.env.COB_SSH_USER ? `${process.env.COB_SSH_USER}@${server}` : server;
-    args.push(target);
-
-    return args;
-}
-
-/* ************************************ */
-function getServerAddress(server) {
-    return process.env.COB_SSH_USER ? `${process.env.COB_SSH_USER}@${server}` : server;
-}
-
-/* ************************************ */
-function getRsyncSsh() {
-    let cmd = "ssh -o ConnectTimeout=30 -o ServerAliveInterval=30 -o ServerAliveCountMax=30 -o StrictHostKeyChecking=no";
-
-    if (process.env.COB_SSH_IDENTITY) cmd += ` -i '${process.env.COB_SSH_IDENTITY}'`;
-    if (process.env.COB_SSH_PORT)     cmd += ` -p ${process.env.COB_SSH_PORT}`;
-
-    return cmd;
-}
-
 /* **************************************************************************************** */
 async function checkWorkingCopyCleanliness(testNotDetached=true) {
     const git = require('simple-git');
@@ -70,81 +32,40 @@ async function checkWorkingCopyCleanliness(testNotDetached=true) {
 function checkConnectivity(server) {
     const execa = require('execa');
     return execa('ssh', [
+        "-o", "StrictHostKeyChecking=no",
+        "-o", "PreferredAuthentications=publickey",
+        "-o", "BatchMode=yes",
         "-o", "ConnectTimeout=15",
-        ...getSshArgs(server),
+        server,
         "test -w /etc/recordm/services/com.cultofbits.web.integration.properties && exit || exit 1"
     ])
 }
 
-
 /* ************************************ */
-let readlineSetup = false
 function getKeypress() {
-    if (!readlineSetup) {
-        readline.emitKeypressEvents(process.stdin);
-        readlineSetup = true
-    }
+    const readline = require('readline');
+
     process.stdin.setRawMode(true);
+    readline.emitKeypressEvents(process.stdin);
     const rl = readline.createInterface({
         input: process.stdin
     });
-   
-    return new Promise(resolve => {
-        const listener = function(letter,key){
-            if(key.name == "return") {
-                console.log("")
-
-            } else {
-                if(key.ctrl && key.name == 'c') letter = "ctrl+c"
-                rl.input.removeListener('keypress', listener)
-                rl.close();
-                process.stdin.setRawMode(false);
-                resolve(letter && letter.toLowerCase() || key.name);
-            }
+    return new Promise(resolve => rl.input.on("keypress", (letter,key) => {
+        if(key.name == "return") {
+            console.log("")
+        } else {
+            if(key.ctrl && key.name == 'c') letter = "ctrl+c"
+            rl.close();
+            process.stdin.setRawMode(false);
+            resolve(letter && letter.toLowerCase() || key.name);
         }
-        rl.input.on("keypress", listener)
-    })
-}
-
-/* ************************************ */
-async function promptCredentials() {
-    const answers = await inquirer.prompt([
-        {
-            type: 'text',
-            message: 'Enter username:',
-            name: 'username',
-        },
-        {
-            type: 'password',
-            message: 'Enter password:',
-            name: 'password',
-            mask: '*',
-        },
-    ])
-
-    return answers
-};
-
-/* ************************************ */
-async function readYamlFile(filename) {
-    try {
-        const data = await fs.readFile(filename, 'utf-8');
-        const config = yaml.load(data);
-        return config
-    } catch (error) {
-        console.error('Error reading YAML file:', error.message);
-    }
+    }))
 }
 
 /* ************************************ */
 module.exports = {
     SERVER_COB_CLI_DIRECTORY : SERVER_COB_CLI_DIRECTORY,
-    getSshArgs: getSshArgs,
-    getServerAddress: getServerAddress,
-    getRsyncSsh: getRsyncSsh,
     checkConnectivity: checkConnectivity,
     checkWorkingCopyCleanliness: checkWorkingCopyCleanliness,
-    getKeypress: getKeypress,
-    promptCredentials: promptCredentials,
-    readYamlFile: readYamlFile
+    getKeypress: getKeypress
 };

package/lib/task_lists/common_releaseManager.js

@@ -1,9 +1,10 @@
 const execa = require('execa');
+const fs = require('fs-extra');
 const git = require('simple-git');
 
 const SERVER_CHANGELOG = "/opt/cob-cli/DEPLOYLOG.md";
 const LAST_SHA_FILE = "lastDeploySha"
-const { SERVER_COB_CLI_DIRECTORY, getSshArgs } = require("./common_helpers");
+const { SERVER_COB_CLI_DIRECTORY } = require("./common_helpers");
 const SERVER_LAST_SHA_FILE = SERVER_COB_CLI_DIRECTORY + LAST_SHA_FILE;
 
 /* ************************************ */
@@ -43,18 +44,18 @@ async function registerRelease(cmdEnv) {
     const dateTimeStr = date.toISOString().slice(0,16).replace(/T/," ")
     const deploySignature = cmdEnv.servername + "_" + dateStr
     const newDeployText = `${dateTimeStr} ${user} [${currentSha}/${cmdEnv.currentBranch}]`
-    await execa('ssh', [...getSshArgs(cmdEnv.server), "echo $'" + newDeployText + "\n" + diffs.replace(/'/g,"\\'") + "' >> " + SERVER_CHANGELOG])
+    await execa('ssh', [cmdEnv.server, "echo $'" + newDeployText + "\n" + diffs.replace(/'/g,"\\'") + "' >> " + SERVER_CHANGELOG])
 
     if (diffs) {
         // Add deploy tags to repo
-        await git().fetch(["--tags","-f"]) // Apenas para ter certeza que temos todas as tags
+        git().fetch(["--tags","-f"]) // Apenas para ter certeza que temos todas as tags
         try {
             await git().silent(true).tag([deploySignature, "-d"])
         } catch {}
 
         await git().addAnnotatedTag(deploySignature, newDeployText )
         await git().push(["-f", "origin", deploySignature])
-        await git().fetch(["--tags","-f"]) // Apenas para ter certeza que temos todas as tags
+        git().fetch(["--tags","-f"]) // Apenas para ter certeza que temos todas as tags
     }
     _setLastDeployedSha(cmdEnv.server, currentSha);
 }
@@ -64,12 +65,9 @@ exports.registerRelease = registerRelease;
 async function getLastDeployedSha(server) {
     let result
     try {
-        result = await execa('ssh', [...getSshArgs(server), "cat " + SERVER_LAST_SHA_FILE ]);
+        result = await execa('ssh', [server, "cat " + SERVER_LAST_SHA_FILE ]);
     } catch (error) {
-        if (error.exitCode === 255) {
-            throw new Error(`SSH connection to '${server}' failed: ${error.shortMessage}`);
-        }
-        await execa('ssh', [...getSshArgs(server), "mkdir -p " + SERVER_COB_CLI_DIRECTORY ]);
+        await execa('ssh', [server, "mkdir -p " + SERVER_COB_CLI_DIRECTORY ]);
         return null
     }
     return result.stdout;
@@ -78,7 +76,7 @@ exports.getLastDeployedSha = getLastDeployedSha;
 
 /* ************************************ */
 function _setLastDeployedSha(server, lastSha) {
-    execa('ssh', [...getSshArgs(server), "echo '" + lastSha + "' > " + SERVER_LAST_SHA_FILE ]);
+    execa('ssh', [server, "echo '" + lastSha + "' > " + SERVER_LAST_SHA_FILE ]);
 }
 
 /* ************************************ */