From 466d659f6eb8ea83aeec5a8ae02af0e844649913 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 9 Jun 2021 17:50:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9ssh=20privateKey?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/plugin-host/src/access-providers/ssh.js | 2 +- .../test/plugins/host-shell-execute.test.js | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/plugins/plugin-host/src/access-providers/ssh.js b/packages/plugins/plugin-host/src/access-providers/ssh.js index 5f152be3..28330b9d 100644 --- a/packages/plugins/plugin-host/src/access-providers/ssh.js +++ b/packages/plugins/plugin-host/src/access-providers/ssh.js @@ -17,7 +17,7 @@ export class SSHAccessProvider { required: true }, password: { desc: '登录密码' }, - publicKey: { + privateKey: { desc: '密钥,密码或此项必填一项' } } diff --git a/packages/plugins/plugin-host/test/plugins/host-shell-execute.test.js b/packages/plugins/plugin-host/test/plugins/host-shell-execute.test.js index 0bd37e53..6c88ef34 100644 --- a/packages/plugins/plugin-host/test/plugins/host-shell-execute.test.js +++ b/packages/plugins/plugin-host/test/plugins/host-shell-execute.test.js @@ -36,4 +36,17 @@ describe('HostShellExecute', function () { expect(ret).ok console.log('-----' + JSON.stringify(ret)) }) + + it('#execute-publicKey-login', async function () { + this.timeout(10000) + const options = createOptions() + const plugin = new HostShellExecute(options) + const shellOpts = { + props: { script: ['ls'], accessProvider: 'tencent-ssh-base01' }, + context: {} + } + const ret = await plugin.doExecute(shellOpts) + expect(ret).ok + console.log('-----' + JSON.stringify(ret)) + }) })