From c7bd38757d88aefb77fb14bf5565ff0f6e0079e0 Mon Sep 17 00:00:00 2001 From: Dragan Filipovic Date: Fri, 30 Dec 2022 15:23:23 +0100 Subject: [PATCH] replace nodeCMD with exec --- .github/workflows/e2e.yml | 37 +- dist/index.js | 525 +----------------- package-lock.json | 14 - package.json | 1 - src/rsyncCli.js | 31 +- .../workflows => tmp}/codeql-analysis.yml | 0 {.github/workflows => tmp}/manual-release.yml | 0 {.github/workflows => tmp}/release.yml | 0 8 files changed, 36 insertions(+), 572 deletions(-) rename {.github/workflows => tmp}/codeql-analysis.yml (100%) rename {.github/workflows => tmp}/manual-release.yml (100%) rename {.github/workflows => tmp}/release.yml (100%) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ded30f7..5ee0d19 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1,9 +1,11 @@ name: e2e Test on: - push: - branches: - - feature/add-tests + workflow_run: + workflows: ["Build"] + branches: [ main ] + types: + - completed env: TEST_HOST_DOCKER: ./test @@ -54,19 +56,11 @@ jobs: date +"%Y-%m-%d %H:%M:%S,%3N" >> index.html cat index.html - # - name: e2e Test local ssh-deploy action - # run: node ./dist/index.js - # env: - # SSH_PRIVATE_KEY: $EXAMPLE_SSH_PRIVATE_KEY - # ARGS: "-rltgoDzvO" - # SOURCE: "test_project/" - # REMOTE_HOST: $EXAMPLE_REMOTE_HOST - # REMOTE_USER: $TEST_USER - # TARGET: "/var/www/html/" - # EXCLUDE: "/dist/, /node_modules/" - - - name: e2e Test published ssh-deploy action - uses: easingthemes/ssh-deploy@main + - name: e2e Test local ssh-deploy action + run: | + npm ci + npm run build + node ./src/index.js env: SSH_PRIVATE_KEY: $EXAMPLE_SSH_PRIVATE_KEY ARGS: "-rltgoDzvO" @@ -76,3 +70,14 @@ jobs: TARGET: "/var/www/html/" EXCLUDE: "/dist/, /node_modules/" + # - name: e2e Test published ssh-deploy action + # uses: easingthemes/ssh-deploy@main + # env: + # SSH_PRIVATE_KEY: $EXAMPLE_SSH_PRIVATE_KEY + # ARGS: "-rltgoDzvO" + # SOURCE: "test_project/" + # REMOTE_HOST: $EXAMPLE_REMOTE_HOST + # REMOTE_USER: $TEST_USER + # TARGET: "/var/www/html/" + # EXCLUDE: "/dist/, /node_modules/" + diff --git a/dist/index.js b/dist/index.js index 2c5655a..656d915 100755 --- a/dist/index.js +++ b/dist/index.js @@ -1,525 +1,2 @@ #!/usr/bin/env node -(() => { - var e = { - 569: (e, r, t) => { - e.exports = t(325); - }, - 325: (e, r, t) => { - "use strict"; - var n = t(81).exec; - var s = t(81).execSync; - var o = t(147); - var c = t(17); - var i = o.access; - var a = o.accessSync; - var u = o.constants || o; - var l = process.platform == "win32"; - var fileNotExists = function (e, r) { - i(e, u.F_OK, function (e) { - r(!e); - }); - }; - var fileNotExistsSync = function (e) { - try { - a(e, u.F_OK); - return false; - } catch (e) { - return true; - } - }; - var localExecutable = function (e, r) { - i(e, u.F_OK | u.X_OK, function (e) { - r(null, !e); - }); - }; - var localExecutableSync = function (e) { - try { - a(e, u.F_OK | u.X_OK); - return true; - } catch (e) { - return false; - } - }; - var commandExistsUnix = function (e, r, t) { - fileNotExists(e, function (s) { - if (!s) { - var o = n("command -v " + r + " 2>/dev/null" + " && { echo >&1 " + r + "; exit 0; }", function (e, r, n) { - t(null, !!r); - }); - return; - } - localExecutable(e, t); - }); - }; - var commandExistsWindows = function (e, r, t) { - if (!/^(?!(?:.*\s|.*\.|\W+)$)(?:[a-zA-Z]:)?(?:(?:[^<>:"\|\?\*\n])+(?:\/\/|\/|\\\\|\\)?)+$/m.test(e)) { - t(null, false); - return; - } - var s = n("where " + r, function (e) { - if (e !== null) { - t(null, false); - } else { - t(null, true); - } - }); - }; - var commandExistsUnixSync = function (e, r) { - if (fileNotExistsSync(e)) { - try { - var t = s("command -v " + r + " 2>/dev/null" + " && { echo >&1 " + r + "; exit 0; }"); - return !!t; - } catch (e) { - return false; - } - } - return localExecutableSync(e); - }; - var commandExistsWindowsSync = function (e, r, t) { - if (!/^(?!(?:.*\s|.*\.|\W+)$)(?:[a-zA-Z]:)?(?:(?:[^<>:"\|\?\*\n])+(?:\/\/|\/|\\\\|\\)?)+$/m.test(e)) { - return false; - } - try { - var n = s("where " + r, { stdio: [] }); - return !!n; - } catch (e) { - return false; - } - }; - var cleanInput = function (e) { - if (/[^A-Za-z0-9_\/:=-]/.test(e)) { - e = "'" + e.replace(/'/g, "'\\''") + "'"; - e = e.replace(/^(?:'')+/g, "").replace(/\\'''/g, "\\'"); - } - return e; - }; - if (l) { - cleanInput = function (e) { - var r = /[\\]/.test(e); - if (r) { - var t = '"' + c.dirname(e) + '"'; - var n = '"' + c.basename(e) + '"'; - return t + ":" + n; - } - return '"' + e + '"'; - }; - } - e.exports = function commandExists(e, r) { - var t = cleanInput(e); - if (!r && typeof Promise !== "undefined") { - return new Promise(function (r, t) { - commandExists(e, function (n, s) { - if (s) { - r(e); - } else { - t(n); - } - }); - }); - } - if (l) { - commandExistsWindows(e, t, r); - } else { - commandExistsUnix(e, t, r); - } - }; - e.exports.sync = function (e) { - var r = cleanInput(e); - if (l) { - return commandExistsWindowsSync(e, r); - } else { - return commandExistsUnixSync(e, r); - } - }; - }, - 748: (e, r, t) => { - const { exec: n, execSync: s } = t(81); - const o = { run: runCommand, runSync: runSync }; - function runCommand(e, r) { - return n( - e, - (function () { - return function (e, t, n) { - if (!r) return; - r(e, t, n); - }; - })(r) - ); - } - function runSync(e) { - try { - return { data: s(e).toString(), err: null, stderr: null }; - } catch (e) { - return { data: null, err: e.stderr.toString(), stderr: e.stderr.toString() }; - } - } - e.exports = o; - }, - 898: (e, r, t) => { - "use strict"; - var n = t(81).spawn; - var s = t(837); - var escapeSpaces = function (e) { - if (typeof e === "string") { - return e.replace(/\b\s/g, "\\ "); - } else { - return e; - } - }; - var escapeSpacesInOptions = function (e) { - ["src", "dest", "include", "exclude", "excludeFirst"].forEach(function (r) { - var t = e[r]; - if (typeof t === "string") { - e[r] = escapeSpaces(t); - } else if (Array.isArray(t) === true) { - e[r] = t.map(escapeSpaces); - } - }); - return e; - }; - e.exports = function (e, r) { - e = e || {}; - e = s._extend({}, e); - e = escapeSpacesInOptions(e); - var t = e.platform || process.platform; - var o = t === "win32"; - if (typeof e.src === "undefined") { - throw new Error("'src' directory is missing from options"); - } - if (typeof e.dest === "undefined") { - throw new Error("'dest' directory is missing from options"); - } - var c = e.dest; - if (typeof e.host !== "undefined") { - c = e.host + ":" + e.dest; - } - if (!Array.isArray(e.src)) { - e.src = [e.src]; - } - var i = [].concat(e.src); - i.push(c); - var a = (e.args || []).find(function (e) { - return e.match(/--chmod=/); - }); - if (o && !a) { - i.push("--chmod=ugo=rwX"); - } - if (typeof e.host !== "undefined" || e.ssh) { - i.push("--rsh"); - var u = "ssh"; - if (typeof e.port !== "undefined") { - u += " -p " + e.port; - } - if (typeof e.privateKey !== "undefined") { - u += " -i " + e.privateKey; - } - if (typeof e.sshCmdArgs !== "undefined") { - u += " " + e.sshCmdArgs.join(" "); - } - i.push(u); - } - if (e.recursive === true) { - i.push("--recursive"); - } - if (e.times === true) { - i.push("--times"); - } - if (e.syncDest === true || e.deleteAll === true) { - i.push("--delete"); - i.push("--delete-excluded"); - } - if (e.syncDestIgnoreExcl === true || e.delete === true) { - i.push("--delete"); - } - if (e.dryRun === true) { - i.push("--dry-run"); - i.push("--verbose"); - } - if (typeof e.excludeFirst !== "undefined" && s.isArray(e.excludeFirst)) { - e.excludeFirst.forEach(function (e, r) { - i.push("--exclude=" + e); - }); - } - if (typeof e.include !== "undefined" && s.isArray(e.include)) { - e.include.forEach(function (e, r) { - i.push("--include=" + e); - }); - } - if (typeof e.exclude !== "undefined" && s.isArray(e.exclude)) { - e.exclude.forEach(function (e, r) { - i.push("--exclude=" + e); - }); - } - switch (e.compareMode) { - case "sizeOnly": - i.push("--size-only"); - break; - case "checksum": - i.push("--checksum"); - break; - } - if (typeof e.args !== "undefined" && s.isArray(e.args)) { - i = [...new Set([...i, ...e.args])]; - } - i = [...new Set(i)]; - var noop = function () {}; - var l = e.onStdout || noop; - var d = e.onStderr || noop; - var f = "rsync "; - i.forEach(function (e) { - if (e.substr(0, 4) === "ssh ") { - e = '"' + e + '"'; - } - f += e + " "; - }); - f = f.trim(); - if (e.noExec) { - r(null, null, null, f); - return; - } - try { - var p = ""; - var y = ""; - var v; - if (o) { - v = n("cmd.exe", ["/s", "/c", '"' + f + '"'], { - windowsVerbatimArguments: true, - stdio: [process.stdin, "pipe", "pipe"], - }); - } else { - v = n("/bin/sh", ["-c", f]); - } - v.stdout.on("data", function (e) { - l(e); - p += e; - }); - v.stderr.on("data", function (e) { - d(e); - y += e; - }); - v.on("exit", function (e) { - var t = null; - if (e !== 0) { - t = new Error("rsync exited with code " + e); - t.code = e; - } - r(t, p, y, f); - }); - } catch (e) { - r(e, null, null, f); - } - }; - }, - 505: (e, r, t) => { - const { existsSync: n, mkdirSync: s, writeFileSync: o } = t(147); - const { GITHUB_WORKSPACE: c } = process.env; - const validateDir = (e) => { - if (!n(e)) { - console.log(`[SSH] Creating ${e} dir in `, c); - s(e); - console.log("✅ [SSH] dir created."); - } else { - console.log(`[SSH] ${e} dir exist`); - } - }; - const validateFile = (e) => { - if (!n(e)) { - console.log(`[SSH] Creating ${e} file in `, c); - try { - o(e, "", { encoding: "utf8", mode: 384 }); - console.log("✅ [SSH] file created."); - } catch (r) { - console.error("⚠️ [SSH] writeFileSync error", e, r.message); - process.abort(); - } - } else { - console.log(`[SSH] ${e} file exist`); - } - }; - e.exports = { validateDir: validateDir, validateFile: validateFile }; - }, - 229: (e) => { - const r = [ - "REMOTE_HOST", - "REMOTE_USER", - "REMOTE_PORT", - "SSH_PRIVATE_KEY", - "DEPLOY_KEY_NAME", - "SOURCE", - "TARGET", - "ARGS", - "EXCLUDE", - ]; - const t = { GITHUB_WORKSPACE: process.env.GITHUB_WORKSPACE }; - r.forEach((e) => { - t[e] = process.env[e] || process.env[`INPUT_${e}`]; - }); - e.exports = t; - }, - 447: (e, r, t) => { - const { sync: n } = t(569); - const { get: s } = t(748); - const validateRsync = (e = () => {}) => { - const r = n("rsync"); - console.log('⚠️ [CLI] Rsync doesn\'t exists. Start installation with "apt-get" \n'); - console.log("nodeCmd: ", s); - if (!r) { - s("sudo apt-get --no-install-recommends install rsync", (r, t, n) => { - if (r) { - console.log("⚠️ [CLI] Rsync installation failed. Aborting ... ", r.message); - process.abort(); - } else { - console.log("✅ [CLI] Rsync installed. \n", t, n); - e(); - } - }); - } else { - e(); - } - }; - const validateInputs = (e) => { - const r = Object.keys(e); - const t = r.filter((r) => { - const t = e[r]; - if (!t) { - console.error(`⚠️ [INPUTS] ${r} is mandatory`); - } - return t; - }); - if (t.length !== r.length) { - console.error("⚠️ [INPUTS] Inputs not valid, aborting ..."); - process.abort(); - } - }; - e.exports = { validateRsync: validateRsync, validateInputs: validateInputs }; - }, - 822: (e, r, t) => { - const { writeFileSync: n } = t(147); - const { join: s } = t(17); - const { validateDir: o, validateFile: c } = t(505); - const { HOME: i } = process.env; - const addSshKey = (e, r) => { - const t = s(i || __dirname, ".ssh"); - const a = s(t, r); - o(t); - c(`${t}/known_hosts`); - try { - n(a, e, { encoding: "utf8", mode: 384 }); - } catch (e) { - console.error("⚠️ writeFileSync error", a, e.message); - process.abort(); - } - console.log("✅ Ssh key added to `.ssh` dir ", a); - return a; - }; - e.exports = { addSshKey: addSshKey }; - }, - 81: (e) => { - "use strict"; - e.exports = require("child_process"); - }, - 147: (e) => { - "use strict"; - e.exports = require("fs"); - }, - 17: (e) => { - "use strict"; - e.exports = require("path"); - }, - 837: (e) => { - "use strict"; - e.exports = require("util"); - }, - }; - var r = {}; - function __nccwpck_require__(t) { - var n = r[t]; - if (n !== undefined) { - return n.exports; - } - var s = (r[t] = { exports: {} }); - var o = true; - try { - e[t](s, s.exports, __nccwpck_require__); - o = false; - } finally { - if (o) delete r[t]; - } - return s.exports; - } - if (typeof __nccwpck_require__ !== "undefined") __nccwpck_require__.ab = __dirname + "/"; - var t = {}; - (() => { - const e = __nccwpck_require__(898); - const { validateRsync: r, validateInputs: t } = __nccwpck_require__(447); - const { addSshKey: n } = __nccwpck_require__(822); - const { - REMOTE_HOST: s, - REMOTE_USER: o, - REMOTE_PORT: c, - SSH_PRIVATE_KEY: i, - DEPLOY_KEY_NAME: a, - SOURCE: u, - TARGET: l, - ARGS: d, - EXCLUDE: f, - GITHUB_WORKSPACE: p, - } = __nccwpck_require__(229); - const y = { ssh: true, sshCmdArgs: ["-o StrictHostKeyChecking=no"], recursive: true }; - console.log("[general] GITHUB_WORKSPACE: ", p); - const v = (() => { - const rsync = ({ privateKey: r, port: t, src: n, dest: s, args: o, exclude: c }) => { - console.log(`[Rsync] Starting Rsync Action: ${n} to ${s}`); - if (c) console.log(`[Rsync] exluding folders ${c}`); - try { - e({ src: n, dest: s, args: o, privateKey: r, port: t, excludeFirst: c, ...y }, (e, r, t, n) => { - if (e) { - console.error("⚠️ [Rsync] error: ", e.message); - console.log("⚠️ [Rsync] stderr: ", t); - console.log("⚠️ [Rsync] stdout: ", r); - console.log("⚠️ [Rsync] cmd: ", n); - process.abort(); - } else { - console.log("✅ [Rsync] finished.", r); - } - }); - } catch (e) { - console.error("⚠️ [Rsync] command error: ", e.message, e.stack); - process.abort(); - } - }; - const init = ({ - src: e, - dest: t, - args: s, - host: o = "localhost", - port: c, - username: i, - privateKeyContent: u, - exclude: l = [], - }) => { - r(() => { - const r = n(u, a || "deploy_key"); - const d = `${i}@${o}:${t}`; - rsync({ privateKey: r, port: c, src: e, dest: d, args: s, exclude: l }); - }); - }; - return { init: init }; - })(); - const run = () => { - t({ SSH_PRIVATE_KEY: i, REMOTE_HOST: s, REMOTE_USER: o }); - v.init({ - src: `${p}/${u || ""}`, - dest: l || `/home/${o}/`, - args: d ? [d] : ["-rltgoDzvO"], - host: s, - port: c || "22", - username: o, - privateKeyContent: i, - exclude: (f || "").split(",").map((e) => e.trim()), - }); - }; - run(); - })(); - module.exports = t; -})(); +(()=>{var e={569:(e,r,t)=>{e.exports=t(325)},325:(e,r,t)=>{"use strict";var n=t(81).exec;var s=t(81).execSync;var o=t(147);var c=t(17);var i=o.access;var a=o.accessSync;var u=o.constants||o;var l=process.platform=="win32";var fileNotExists=function(e,r){i(e,u.F_OK,(function(e){r(!e)}))};var fileNotExistsSync=function(e){try{a(e,u.F_OK);return false}catch(e){return true}};var localExecutable=function(e,r){i(e,u.F_OK|u.X_OK,(function(e){r(null,!e)}))};var localExecutableSync=function(e){try{a(e,u.F_OK|u.X_OK);return true}catch(e){return false}};var commandExistsUnix=function(e,r,t){fileNotExists(e,(function(s){if(!s){var o=n("command -v "+r+" 2>/dev/null"+" && { echo >&1 "+r+"; exit 0; }",(function(e,r,n){t(null,!!r)}));return}localExecutable(e,t)}))};var commandExistsWindows=function(e,r,t){if(!/^(?!(?:.*\s|.*\.|\W+)$)(?:[a-zA-Z]:)?(?:(?:[^<>:"\|\?\*\n])+(?:\/\/|\/|\\\\|\\)?)+$/m.test(e)){t(null,false);return}var s=n("where "+r,(function(e){if(e!==null){t(null,false)}else{t(null,true)}}))};var commandExistsUnixSync=function(e,r){if(fileNotExistsSync(e)){try{var t=s("command -v "+r+" 2>/dev/null"+" && { echo >&1 "+r+"; exit 0; }");return!!t}catch(e){return false}}return localExecutableSync(e)};var commandExistsWindowsSync=function(e,r,t){if(!/^(?!(?:.*\s|.*\.|\W+)$)(?:[a-zA-Z]:)?(?:(?:[^<>:"\|\?\*\n])+(?:\/\/|\/|\\\\|\\)?)+$/m.test(e)){return false}try{var n=s("where "+r,{stdio:[]});return!!n}catch(e){return false}};var cleanInput=function(e){if(/[^A-Za-z0-9_\/:=-]/.test(e)){e="'"+e.replace(/'/g,"'\\''")+"'";e=e.replace(/^(?:'')+/g,"").replace(/\\'''/g,"\\'")}return e};if(l){cleanInput=function(e){var r=/[\\]/.test(e);if(r){var t='"'+c.dirname(e)+'"';var n='"'+c.basename(e)+'"';return t+":"+n}return'"'+e+'"'}}e.exports=function commandExists(e,r){var t=cleanInput(e);if(!r&&typeof Promise!=="undefined"){return new Promise((function(r,t){commandExists(e,(function(n,s){if(s){r(e)}else{t(n)}}))}))}if(l){commandExistsWindows(e,t,r)}else{commandExistsUnix(e,t,r)}};e.exports.sync=function(e){var r=cleanInput(e);if(l){return commandExistsWindowsSync(e,r)}else{return commandExistsUnixSync(e,r)}}},748:(e,r,t)=>{const{exec:n,execSync:s}=t(81);const o={run:runCommand,runSync:runSync};function runCommand(e,r){return n(e,function(){return function(e,t,n){if(!r)return;r(e,t,n)}}(r))}function runSync(e){try{return{data:s(e).toString(),err:null,stderr:null}}catch(e){return{data:null,err:e.stderr.toString(),stderr:e.stderr.toString()}}}e.exports=o},898:(e,r,t)=>{"use strict";var n=t(81).spawn;var s=t(837);var escapeSpaces=function(e){if(typeof e==="string"){return e.replace(/\b\s/g,"\\ ")}else{return e}};var escapeSpacesInOptions=function(e){["src","dest","include","exclude","excludeFirst"].forEach((function(r){var t=e[r];if(typeof t==="string"){e[r]=escapeSpaces(t)}else if(Array.isArray(t)===true){e[r]=t.map(escapeSpaces)}}));return e};e.exports=function(e,r){e=e||{};e=s._extend({},e);e=escapeSpacesInOptions(e);var t=e.platform||process.platform;var o=t==="win32";if(typeof e.src==="undefined"){throw new Error("'src' directory is missing from options")}if(typeof e.dest==="undefined"){throw new Error("'dest' directory is missing from options")}var c=e.dest;if(typeof e.host!=="undefined"){c=e.host+":"+e.dest}if(!Array.isArray(e.src)){e.src=[e.src]}var i=[].concat(e.src);i.push(c);var a=(e.args||[]).find((function(e){return e.match(/--chmod=/)}));if(o&&!a){i.push("--chmod=ugo=rwX")}if(typeof e.host!=="undefined"||e.ssh){i.push("--rsh");var u="ssh";if(typeof e.port!=="undefined"){u+=" -p "+e.port}if(typeof e.privateKey!=="undefined"){u+=" -i "+e.privateKey}if(typeof e.sshCmdArgs!=="undefined"){u+=" "+e.sshCmdArgs.join(" ")}i.push(u)}if(e.recursive===true){i.push("--recursive")}if(e.times===true){i.push("--times")}if(e.syncDest===true||e.deleteAll===true){i.push("--delete");i.push("--delete-excluded")}if(e.syncDestIgnoreExcl===true||e.delete===true){i.push("--delete")}if(e.dryRun===true){i.push("--dry-run");i.push("--verbose")}if(typeof e.excludeFirst!=="undefined"&&s.isArray(e.excludeFirst)){e.excludeFirst.forEach((function(e,r){i.push("--exclude="+e)}))}if(typeof e.include!=="undefined"&&s.isArray(e.include)){e.include.forEach((function(e,r){i.push("--include="+e)}))}if(typeof e.exclude!=="undefined"&&s.isArray(e.exclude)){e.exclude.forEach((function(e,r){i.push("--exclude="+e)}))}switch(e.compareMode){case"sizeOnly":i.push("--size-only");break;case"checksum":i.push("--checksum");break}if(typeof e.args!=="undefined"&&s.isArray(e.args)){i=[...new Set([...i,...e.args])]}i=[...new Set(i)];var noop=function(){};var l=e.onStdout||noop;var d=e.onStderr||noop;var f="rsync ";i.forEach((function(e){if(e.substr(0,4)==="ssh "){e='"'+e+'"'}f+=e+" "}));f=f.trim();if(e.noExec){r(null,null,null,f);return}try{var p="";var y="";var v;if(o){v=n("cmd.exe",["/s","/c",'"'+f+'"'],{windowsVerbatimArguments:true,stdio:[process.stdin,"pipe","pipe"]})}else{v=n("/bin/sh",["-c",f])}v.stdout.on("data",(function(e){l(e);p+=e}));v.stderr.on("data",(function(e){d(e);y+=e}));v.on("exit",(function(e){var t=null;if(e!==0){t=new Error("rsync exited with code "+e);t.code=e}r(t,p,y,f)}))}catch(e){r(e,null,null,f)}}},505:(e,r,t)=>{const{existsSync:n,mkdirSync:s,writeFileSync:o}=t(147);const{GITHUB_WORKSPACE:c}=process.env;const validateDir=e=>{if(!n(e)){console.log(`[SSH] Creating ${e} dir in `,c);s(e);console.log("✅ [SSH] dir created.")}else{console.log(`[SSH] ${e} dir exist`)}};const validateFile=e=>{if(!n(e)){console.log(`[SSH] Creating ${e} file in `,c);try{o(e,"",{encoding:"utf8",mode:384});console.log("✅ [SSH] file created.")}catch(r){console.error("⚠️ [SSH] writeFileSync error",e,r.message);process.abort()}}else{console.log(`[SSH] ${e} file exist`)}};e.exports={validateDir:validateDir,validateFile:validateFile}},229:e=>{const r=["REMOTE_HOST","REMOTE_USER","REMOTE_PORT","SSH_PRIVATE_KEY","DEPLOY_KEY_NAME","SOURCE","TARGET","ARGS","EXCLUDE"];const t={GITHUB_WORKSPACE:process.env.GITHUB_WORKSPACE};r.forEach((e=>{t[e]=process.env[e]||process.env[`INPUT_${e}`]}));e.exports=t},447:(e,r,t)=>{const{sync:n}=t(569);const{get:s}=t(748);const validateRsync=(e=(()=>{}))=>{const r=n("rsync");console.log('⚠️ [CLI] Rsync doesn\'t exists. Start installation with "apt-get" \n');console.log("nodeCmd: ",s);if(!r){s("sudo apt-get --no-install-recommends install rsync",((r,t,n)=>{if(r){console.log("⚠️ [CLI] Rsync installation failed. Aborting ... ",r.message);process.abort()}else{console.log("✅ [CLI] Rsync installed. \n",t,n);e()}}))}else{e()}};const validateInputs=e=>{const r=Object.keys(e);const t=r.filter((r=>{const t=e[r];if(!t){console.error(`⚠️ [INPUTS] ${r} is mandatory`)}return t}));if(t.length!==r.length){console.error("⚠️ [INPUTS] Inputs not valid, aborting ...");process.abort()}};e.exports={validateRsync:validateRsync,validateInputs:validateInputs}},822:(e,r,t)=>{const{writeFileSync:n}=t(147);const{join:s}=t(17);const{validateDir:o,validateFile:c}=t(505);const{HOME:i}=process.env;const addSshKey=(e,r)=>{const t=s(i||__dirname,".ssh");const a=s(t,r);o(t);c(`${t}/known_hosts`);try{n(a,e,{encoding:"utf8",mode:384})}catch(e){console.error("⚠️ writeFileSync error",a,e.message);process.abort()}console.log("✅ Ssh key added to `.ssh` dir ",a);return a};e.exports={addSshKey:addSshKey}},81:e=>{"use strict";e.exports=require("child_process")},147:e=>{"use strict";e.exports=require("fs")},17:e=>{"use strict";e.exports=require("path")},837:e=>{"use strict";e.exports=require("util")}};var r={};function __nccwpck_require__(t){var n=r[t];if(n!==undefined){return n.exports}var s=r[t]={exports:{}};var o=true;try{e[t](s,s.exports,__nccwpck_require__);o=false}finally{if(o)delete r[t]}return s.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t={};(()=>{const e=__nccwpck_require__(898);const{validateRsync:r,validateInputs:t}=__nccwpck_require__(447);const{addSshKey:n}=__nccwpck_require__(822);const{REMOTE_HOST:s,REMOTE_USER:o,REMOTE_PORT:c,SSH_PRIVATE_KEY:i,DEPLOY_KEY_NAME:a,SOURCE:u,TARGET:l,ARGS:d,EXCLUDE:f,GITHUB_WORKSPACE:p}=__nccwpck_require__(229);const y={ssh:true,sshCmdArgs:["-o StrictHostKeyChecking=no"],recursive:true};console.log("[general] GITHUB_WORKSPACE: ",p);const v=(()=>{const rsync=({privateKey:r,port:t,src:n,dest:s,args:o,exclude:c})=>{console.log(`[Rsync] Starting Rsync Action: ${n} to ${s}`);if(c)console.log(`[Rsync] exluding folders ${c}`);try{e({src:n,dest:s,args:o,privateKey:r,port:t,excludeFirst:c,...y},((e,r,t,n)=>{if(e){console.error("⚠️ [Rsync] error: ",e.message);console.log("⚠️ [Rsync] stderr: ",t);console.log("⚠️ [Rsync] stdout: ",r);console.log("⚠️ [Rsync] cmd: ",n);process.abort()}else{console.log("✅ [Rsync] finished.",r)}}))}catch(e){console.error("⚠️ [Rsync] command error: ",e.message,e.stack);process.abort()}};const init=({src:e,dest:t,args:s,host:o="localhost",port:c,username:i,privateKeyContent:u,exclude:l=[]})=>{r((()=>{const r=n(u,a||"deploy_key");const d=`${i}@${o}:${t}`;rsync({privateKey:r,port:c,src:e,dest:d,args:s,exclude:l})}))};return{init:init}})();const run=()=>{t({SSH_PRIVATE_KEY:i,REMOTE_HOST:s,REMOTE_USER:o});v.init({src:`${p}/${u||""}`,dest:l||`/home/${o}/`,args:d?[d]:["-rltgoDzvO"],host:s,port:c||"22",username:o,privateKeyContent:i,exclude:(f||"").split(",").map((e=>e.trim()))})};run()})();module.exports=t})(); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 49c75b1..4026c44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "MIT", "dependencies": { "command-exists": "^1.2.9", - "node-cmd": "^5.0.0", "rsyncwrapper": "^3.0.1" }, "devDependencies": { @@ -1397,14 +1396,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/node-cmd": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/node-cmd/-/node-cmd-5.0.0.tgz", - "integrity": "sha512-4sQTJmsS5uZKAPz/Df9fnIbmvOySfGdW+UreH4X5NcAOOpKjaE+K5wf4ehNBbZVPo0vQ36RkRnhhsXXJAT+Syw==", - "engines": { - "node": ">=6.4.0" - } - }, "node_modules/object-inspect": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", @@ -3012,11 +3003,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node-cmd": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/node-cmd/-/node-cmd-5.0.0.tgz", - "integrity": "sha512-4sQTJmsS5uZKAPz/Df9fnIbmvOySfGdW+UreH4X5NcAOOpKjaE+K5wf4ehNBbZVPo0vQ36RkRnhhsXXJAT+Syw==" - }, "object-inspect": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", diff --git a/package.json b/package.json index f6a6a16..41d082c 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "homepage": "https://github.com/easingthemes/ssh-deploy#readme", "dependencies": { "command-exists": "^1.2.9", - "node-cmd": "^5.0.0", "rsyncwrapper": "^3.0.1" }, "devDependencies": { diff --git a/src/rsyncCli.js b/src/rsyncCli.js index 9a5b6a4..b29beea 100644 --- a/src/rsyncCli.js +++ b/src/rsyncCli.js @@ -1,23 +1,20 @@ -const { sync: commandExists } = require('command-exists'); -const { get: nodeCmd } = require('node-cmd'); +const { sync: commandExists } = require("command-exists"); +const { exec, execSync } = require("child_process"); const validateRsync = (callback = () => {}) => { - const rsyncCli = commandExists('rsync'); + const rsyncCli = commandExists("rsync"); console.log('⚠️ [CLI] Rsync doesn\'t exists. Start installation with "apt-get" \n'); - console.log('nodeCmd: ', nodeCmd); if (!rsyncCli) { - nodeCmd( - 'sudo apt-get --no-install-recommends install rsync', - (err, data, stderr) => { - if (err) { - console.log('⚠️ [CLI] Rsync installation failed. Aborting ... ', err.message); - process.abort(); - } else { - console.log('✅ [CLI] Rsync installed. \n', data, stderr); - callback(); - } + execSync("sudo apt-get update"); + exec("sudo apt-get --no-install-recommends install rsync", (err, data, stderr) => { + if (err) { + console.log("⚠️ [CLI] Rsync installation failed. Aborting ... ", err.message); + process.abort(); + } else { + console.log("✅ [CLI] Rsync installed. \n", data, stderr); + callback(); } - ); + }); } else { callback(); } @@ -36,12 +33,12 @@ const validateInputs = (inputs) => { }); if (validInputs.length !== inputKeys.length) { - console.error('⚠️ [INPUTS] Inputs not valid, aborting ...'); + console.error("⚠️ [INPUTS] Inputs not valid, aborting ..."); process.abort(); } }; module.exports = { validateRsync, - validateInputs + validateInputs, }; diff --git a/.github/workflows/codeql-analysis.yml b/tmp/codeql-analysis.yml similarity index 100% rename from .github/workflows/codeql-analysis.yml rename to tmp/codeql-analysis.yml diff --git a/.github/workflows/manual-release.yml b/tmp/manual-release.yml similarity index 100% rename from .github/workflows/manual-release.yml rename to tmp/manual-release.yml diff --git a/.github/workflows/release.yml b/tmp/release.yml similarity index 100% rename from .github/workflows/release.yml rename to tmp/release.yml