diff --git a/packages/core/executor/src/index.js b/packages/core/executor/src/index.js index 5bf953bb..e299b535 100644 --- a/packages/core/executor/src/index.js +++ b/packages/core/executor/src/index.js @@ -23,7 +23,6 @@ export class Executor { async run (options) { logger.info('------------------- Cert-D ---------------------') try { - this.transferToSafetyOptions(options) options = _.merge(createDefaultOptions(), options) return await this.doRun(options) } catch (e) { diff --git a/packages/core/executor/test/index.test.js b/packages/core/executor/test/index.test.js index 01101f1d..90cfb228 100644 --- a/packages/core/executor/test/index.test.js +++ b/packages/core/executor/test/index.test.js @@ -1,8 +1,16 @@ import pkg from 'chai' -import { Executor } from '../src' +import { Executor } from '../src/index.js' import { createOptions } from '../../../../test/options.js' +import PluginAliyun from '@certd/plugin-aliyun' +import PluginTencent from '@certd/plugin-tencent' +import PluginHost from '@certd/plugin-host' const { expect } = pkg +// 安装默认插件和授权提供者 +PluginAliyun.install() +PluginTencent.install() +PluginHost.install() + describe('AutoDeploy', function () { it('#run', async function () { this.timeout(120000) diff --git a/packages/plugins/plugin-host/src/index.js b/packages/plugins/plugin-host/src/index.js index 350d7bd2..caedccd5 100644 --- a/packages/plugins/plugin-host/src/index.js +++ b/packages/plugins/plugin-host/src/index.js @@ -1,9 +1,9 @@ import _ from 'lodash-es' -import { SSHAccessProvider } from './access-providers/ssh' +import { SSHAccessProvider } from './access-providers/ssh.js' -import { UploadCertToHost } from './host/upload-to-host/index.js' -import { HostShellExecute } from './host/host-shell-execute/index.js' +import { UploadCertToHost } from './plugins/upload-to-host/index.js' +import { HostShellExecute } from './plugins/host-shell-execute/index.js' import { pluginRegistry, accessProviderRegistry } from '@certd/api' diff --git a/test/options.js b/test/options.js index 4d14b021..6aadb261 100644 --- a/test/options.js +++ b/test/options.js @@ -66,7 +66,7 @@ const defaultOptions = { props:{ domainName: 'certd-cdn-upload.docmirror.cn', certName: 'certd部署测试(upload)', - certType: 'upload', + from: 'upload', accessProvider: 'aliyun' } } @@ -82,29 +82,22 @@ const defaultOptions = { disabled: true, tasks: [ { - taskName: '上传证书到服务器,并重启nginx', - type: 'sshAndExecute', + taskName: '上传证书到服务器', + type: 'uploadCertToHost', props:{ - accessProvider: 'myLinux', + accessProvider: 'aliyun-linux', upload: [ { from: '{certPath}', to: '/xxx/xxx/xxx.cert.pem' }, { from: '{keyPath}', to: '/xxx/xxx/xxx.key' } - ], - script: 'sudo systemctl restart nginx' + ] } - } - ] - }, - { - deployName: '流程3-触发jenkins任务', - disabled: false, - tasks: [ + }, { - taskName: '触发jenkins任务', - type: 'sshAndExecute', + taskName: '重启linux', + type: 'hostShellExecute', props:{ - accessProvider: 'myLinux', - script: 'sudo systemctl restart nginx' + accessProvider: 'aliyun-linux', + script: ['ls'] } } ]