From 7aa3d8e5d9fa875833ac5a944b71a82e9d9c1abd Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 18 Sep 2024 14:58:59 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=AF=81=E4=B9=A6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pipeline/component/output-selector/index.vue | 8 ++++++-- .../plugin/deploy-to-ack-ingress/index.ts | 2 +- .../plugin-aliyun/plugin/deploy-to-cdn/index.ts | 2 +- .../plugin-aliyun/plugin/deploy-to-dcdn/index.ts | 2 +- .../plugin-aliyun/plugin/upload-to-aliyun/index.ts | 10 +++++----- .../plugin-cloudflare/plugins/plugin-deploy-to-cdn.ts | 2 +- .../src/plugins/plugin-demo/plugins/plugin-test.ts | 2 +- .../plugins/plugin-doge/plugins/deploy-to-cdn/index.ts | 2 +- .../plugins/plugin-host/plugin/copy-to-local/index.ts | 2 +- .../plugins/plugin-host/plugin/upload-to-host/index.ts | 2 +- .../src/plugins/plugin-other/plugins/plugin-k8s.ts | 2 +- .../src/plugins/plugin-other/plugins/plugin-script.ts | 2 +- .../plugin-tencent/plugin/deploy-to-cdn/index.ts | 2 +- .../plugin-tencent/plugin/deploy-to-clb/index.ts | 2 +- .../plugin/deploy-to-tke-ingress/index.ts | 2 +- .../plugin-tencent/plugin/upload-to-tencent/index.ts | 2 +- 16 files changed, 25 insertions(+), 21 deletions(-) diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/output-selector/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/output-selector/index.vue index b4b859fb..d8d4ab16 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/output-selector/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/output-selector/index.vue @@ -14,7 +14,7 @@ export default { default: undefined }, from: { - type: String + type: [String, Array] } }, emits: ["update:modelValue"], @@ -36,7 +36,11 @@ export default { currentTask: currentTask.value }); if (props.from) { - options.value = options.value.filter((item: any) => item.type === props.from); + if (typeof props.from === "string") { + options.value = options.value.filter((item: any) => item.type === props.from); + } else { + options.value = options.value.filter((item: any) => props.from.includes(item.type)); + } } if (props.modelValue == null && options.value.length > 0) { ctx.emit("update:modelValue", options.value[0].value); diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts index d735c17f..0420650c 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts @@ -88,7 +88,7 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts index daf6bd52..098b7634 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts @@ -31,7 +31,7 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts index ccdeaab6..d7e3acaf 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts @@ -31,7 +31,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts index 69e771a4..7f6efb7e 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts @@ -1,6 +1,6 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline'; import { appendTimeSuffix, checkRet } from '../../utils/index.js'; -import { AliyunAccess, AliyunClient } from "@certd/plugin-plus"; +import { AliyunAccess, AliyunClient } from '@certd/plugin-plus'; @IsTaskPlugin({ name: 'uploadCertToAliyun', @@ -37,7 +37,7 @@ export class UploadCertToAliyun extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) @@ -86,14 +86,14 @@ export class UploadCertToAliyun extends AbstractTaskPlugin { } async getClient(aliyunProvider: AliyunAccess) { - const client = new AliyunClient({logger:this.logger}) + const client = new AliyunClient({ logger: this.logger }); await client.init({ accessKeyId: aliyunProvider.accessKeyId, accessKeySecret: aliyunProvider.accessKeySecret, endpoint: 'https://cas.aliyuncs.com', apiVersion: '2018-07-13', - }) - return client + }); + return client; } } //注册插件 diff --git a/packages/ui/certd-server/src/plugins/plugin-cloudflare/plugins/plugin-deploy-to-cdn.ts b/packages/ui/certd-server/src/plugins/plugin-cloudflare/plugins/plugin-deploy-to-cdn.ts index c361c6f4..22fb4ddf 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cloudflare/plugins/plugin-deploy-to-cdn.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cloudflare/plugins/plugin-deploy-to-cdn.ts @@ -54,7 +54,7 @@ export class CloudflareDeployToCDNPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts index 29bbb3ef..42f063b1 100644 --- a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts +++ b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts @@ -53,7 +53,7 @@ export class DemoTestPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, // required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts index 20e5e9c1..78b22abf 100644 --- a/packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts @@ -26,7 +26,7 @@ export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts index 5cd0b23e..31fbd396 100644 --- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts @@ -56,7 +56,7 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts index e1ef6235..996856ce 100644 --- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts @@ -56,7 +56,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-k8s.ts b/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-k8s.ts index c5f24b05..e4b48c24 100644 --- a/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-k8s.ts +++ b/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-k8s.ts @@ -60,7 +60,7 @@ export class K8STestPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-script.ts b/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-script.ts index 254c3e76..434b8423 100644 --- a/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-script.ts +++ b/packages/ui/certd-server/src/plugins/plugin-other/plugins/plugin-script.ts @@ -36,7 +36,7 @@ export class CustomScriptPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts index 2334ad76..fbfca770 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts @@ -18,7 +18,7 @@ export class DeployToCdnPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts index 7b598547..cd64beb8 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts @@ -75,7 +75,7 @@ export class DeployToClbPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts index a8e2ca9f..5086992f 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts @@ -83,7 +83,7 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, }) diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/upload-to-tencent/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/upload-to-tencent/index.ts index 3bc0e41a..c5ae81ed 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/upload-to-tencent/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/upload-to-tencent/index.ts @@ -32,7 +32,7 @@ export class UploadToTencentPlugin extends AbstractTaskPlugin { helper: '请选择前置任务输出的域名证书', component: { name: 'pi-output-selector', - from: 'CertApply', + from: ['CertApply', 'CertApplyLego'], }, required: true, })