From 06a7371d2be2bd350c59facdc96930ebbdc97b39 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sat, 10 May 2025 15:04:57 +0800 Subject: [PATCH] chore: --- .../plugin/deploy-to-fc/index.ts | 13 ++++++------- .../plugin/deploy-to-waf/index.ts | 19 ++++++++++++------- .../plugins/plugin-deploy-to-cloudfront.ts | 19 +++++++++---------- .../plugin/deploy-to-live/index.ts | 13 ++++++------- .../plugin/deploy-to-tke-ingress/index.ts | 14 +++++++------- .../plugins/plugin-depoy-to-cdn.ts | 10 ++++------ 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-fc/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-fc/index.ts index 12d3857e..7fdaa829 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-fc/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-fc/index.ts @@ -1,22 +1,21 @@ -import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { CertInfo } from '@certd/plugin-cert'; -import { AliyunAccess, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; -import { AbstractPlusTaskPlugin } from '@certd/plugin-plus'; -import { CertApplyPluginNames} from '@certd/plugin-cert'; +import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; +import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; +import { AliyunAccess, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; + @IsTaskPlugin({ name: 'AliyunDeployCertToFC', title: '阿里云-部署至阿里云FC(3.0)', icon: 'svg:icon-aliyun', group: pluginGroups.aliyun.key, desc: '部署证书到阿里云函数计算（FC3.0）,【注意】证书的加密算法必须选择【pkcs1旧版】', - needPlus: true, + needPlus: false, default: { strategy: { runStrategy: RunStrategy.SkipWhenSucceed, }, }, }) -export class AliyunDeployCertToFC extends AbstractPlusTaskPlugin { +export class AliyunDeployCertToFC extends AbstractTaskPlugin { @TaskInput({ title: '域名证书', helper: '请选择证书申请任务输出的域名证书', diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts index d8588ce6..108c975c 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts @@ -1,22 +1,27 @@ -import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { CertInfo } from '@certd/plugin-cert'; -import { AliyunAccess, AliyunClient, AliyunSslClient, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; -import { AbstractPlusTaskPlugin } from '@certd/plugin-plus'; -import { CertApplyPluginNames} from '@certd/plugin-cert'; +import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; +import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; +import { + AliyunAccess, + AliyunClient, + AliyunSslClient, + createCertDomainGetterInputDefine, + createRemoteSelectInputDefine +} from "@certd/plugin-lib"; + @IsTaskPlugin({ name: 'AliyunDeployCertToWaf', title: '阿里云-部署至阿里云WAF', icon: 'svg:icon-aliyun', group: pluginGroups.aliyun.key, desc: '部署证书到阿里云WAF', - needPlus: true, + needPlus: false, default: { strategy: { runStrategy: RunStrategy.SkipWhenSucceed, }, }, }) -export class AliyunDeployCertToWaf extends AbstractPlusTaskPlugin { +export class AliyunDeployCertToWaf extends AbstractTaskPlugin { @TaskInput({ title: '域名证书', helper: '请选择证书申请任务输出的域名证书\n或者选择前置任务“上传证书到阿里云”任务的证书ID，可以减少上传到阿里云的证书数量', diff --git a/packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts b/packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts index d7b29747..1d66bae7 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts @@ -1,25 +1,24 @@ -import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { CertInfo } from '@certd/plugin-cert'; -import { AwsAccess, AwsRegions } from '../access.js'; -import { AwsAcmClient } from '../libs/aws-acm-client.js'; -import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib'; -import { optionsUtils } from '@certd/basic/dist/utils/util.options.js'; -import { AbstractPlusTaskPlugin } from '@certd/plugin-plus'; -import { CertApplyPluginNames} from '@certd/plugin-cert'; +import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; +import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; +import { AwsAccess, AwsRegions } from "../access.js"; +import { AwsAcmClient } from "../libs/aws-acm-client.js"; +import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; +import { optionsUtils } from "@certd/basic/dist/utils/util.options.js"; + @IsTaskPlugin({ name: 'AwsDeployToCloudFront', title: 'AWS-部署证书到CloudFront', desc: '部署证书到 AWS CloudFront', icon: 'svg:icon-aws', group: pluginGroups.aws.key, - needPlus: true, + needPlus: false, default: { strategy: { runStrategy: RunStrategy.SkipWhenSucceed, }, }, }) -export class AwsDeployToCloudFront extends AbstractPlusTaskPlugin { +export class AwsDeployToCloudFront extends AbstractTaskPlugin { @TaskInput({ title: '域名证书', helper: '请选择前置任务输出的域名证书', diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-live/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-live/index.ts index c086fbc2..92b0f626 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-live/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-live/index.ts @@ -1,22 +1,21 @@ -import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { CertInfo } from '@certd/plugin-cert'; -import { createRemoteSelectInputDefine, TencentAccess, TencentSslClient } from '@certd/plugin-lib'; -import { AbstractPlusTaskPlugin } from '@certd/plugin-plus'; -import { CertApplyPluginNames} from '@certd/plugin-cert'; +import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; +import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; +import { createRemoteSelectInputDefine, TencentAccess, TencentSslClient } from "@certd/plugin-lib"; + @IsTaskPlugin({ name: 'TencentDeployCertToLive', title: '腾讯云-部署到腾讯云直播', icon: 'svg:icon-tencentcloud', desc: 'https://console.cloud.tencent.com/live/', group: pluginGroups.tencent.key, - needPlus: true, + needPlus: false, default: { strategy: { runStrategy: RunStrategy.SkipWhenSucceed, }, }, }) -export class TencentDeployCertToLive extends AbstractPlusTaskPlugin { +export class TencentDeployCertToLive extends AbstractTaskPlugin { @TaskInput({ title: 'Access提供者', helper: 'access 授权', 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 a5244e1a..8b88001a 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 @@ -1,13 +1,13 @@ -import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline'; -import { utils } from '@certd/basic'; +import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; +import { utils } from "@certd/basic"; + +import dayjs from "dayjs"; +import { CertApplyPluginNames } from "@certd/plugin-cert"; -import dayjs from 'dayjs'; -import { AbstractPlusTaskPlugin } from '@certd/plugin-plus'; -import { CertApplyPluginNames} from '@certd/plugin-cert'; @IsTaskPlugin({ name: 'DeployCertToTencentTKEIngress', title: '腾讯云-部署到TKE-ingress', - needPlus: true, + needPlus: false, icon: 'svg:icon-tencentcloud', group: pluginGroups.tencent.key, desc: 'serverless集群请使用K8S部署插件；Qcloud类型需要【上传到腾讯云】作为前置任务；ApiServer未开启外网访问则需要做域名的内网IP映射', @@ -17,7 +17,7 @@ import { CertApplyPluginNames} from '@certd/plugin-cert'; }, }, }) -export class DeployCertToTencentTKEIngressPlugin extends AbstractPlusTaskPlugin { +export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin { @TaskInput({ title: '大区', value: 'ap-guangzhou', required: true }) region!: string; diff --git a/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts b/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts index 3a066b6f..0e743ade 100644 --- a/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts +++ b/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts @@ -1,9 +1,7 @@ -import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; -import { CertInfo } from "@certd/plugin-cert"; -import { AbstractPlusTaskPlugin } from "@certd/plugin-plus"; +import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; +import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; import { UpyunAccess } from "../access.js"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; -import { CertApplyPluginNames } from "@certd/plugin-cert"; import { optionsUtils } from "@certd/basic/dist/utils/util.options.js"; import { UpyunClient } from "../client.js"; @@ -15,7 +13,7 @@ import { UpyunClient } from "../client.js"; desc:"支持又拍云CDN，又拍云云存储USS", //插件分组 group: pluginGroups.cdn.key, - needPlus: true, + needPlus: false, default: { //默认值配置照抄即可 strategy: { @@ -24,7 +22,7 @@ import { UpyunClient } from "../client.js"; } }) //类名规范，跟上面插件名称（name）一致 -export class UpyunDeployToCdn extends AbstractPlusTaskPlugin { +export class UpyunDeployToCdn extends AbstractTaskPlugin { //证书选择，此项必须要有 @TaskInput({ title: "域名证书",