From 0f772d55abc00c7aa29eb862290d74701ba8aee6 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 8 Jan 2025 15:53:17 +0800 Subject: [PATCH 1/2] refactor(ui): clean code --- ui/src/components/workflow/node/ApplyNodeConfigForm.tsx | 4 ++-- .../workflow/node/DeployNodeConfigFormAliyunCDNConfig.tsx | 2 +- .../workflow/node/DeployNodeConfigFormAliyunDCDNConfig.tsx | 2 +- .../workflow/node/DeployNodeConfigFormAliyunOSSConfig.tsx | 2 +- .../workflow/node/DeployNodeConfigFormBaiduCloudCDNConfig.tsx | 2 +- .../workflow/node/DeployNodeConfigFormBytePlusCDNConfig.tsx | 2 +- .../workflow/node/DeployNodeConfigFormQiniuCDNConfig.tsx | 2 +- .../node/DeployNodeConfigFormTencentCloudCDNConfig.tsx | 2 +- .../node/DeployNodeConfigFormTencentCloudCLBConfig.tsx | 2 +- .../node/DeployNodeConfigFormTencentCloudECDNConfig.tsx | 2 +- .../workflow/node/DeployNodeConfigFormVolcEngineCDNConfig.tsx | 2 +- .../node/DeployNodeConfigFormVolcEngineLiveConfig.tsx | 2 +- ui/src/utils/validators.ts | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx b/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx index 1f216bee..74dee080 100644 --- a/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx @@ -50,7 +50,7 @@ const ApplyNodeConfigForm = forwardRef { return String(v) .split(MULTIPLE_INPUT_DELIMITER) - .every((e) => validDomainName(e, true)); + .every((e) => validDomainName(e, { allowWildcard: true })); }, t("common.errmsg.domain_invalid")), contactEmail: z.string({ message: t("workflow_node.apply.form.contact_email.placeholder") }).email(t("common.errmsg.email_invalid")), providerAccessId: z @@ -308,7 +308,7 @@ const DomainsModalInput = memo(({ value, trigger, onChange }: { value?: string; const formSchema = z.object({ domains: z.array(z.string()).refine((v) => { - return v.every((e) => !e?.trim() || validDomainName(e.trim(), true)); + return v.every((e) => !e?.trim() || validDomainName(e.trim(), { allowWildcard: true })); }, t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunCDNConfig.tsx index c5da5df5..5efffd9f 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunCDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunCDNConfig.tsx @@ -33,7 +33,7 @@ const DeployNodeConfigFormAliyunCDNConfig = ({ const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.aliyun_cdn_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunDCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunDCDNConfig.tsx index 7a701dda..836bdca0 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunDCDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunDCDNConfig.tsx @@ -33,7 +33,7 @@ const DeployNodeConfigFormAliyunDCDNConfig = ({ const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.aliyun_dcdn_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunOSSConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunOSSConfig.tsx index 89e4e315..156892f9 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormAliyunOSSConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormAliyunOSSConfig.tsx @@ -43,7 +43,7 @@ const DeployNodeConfigFormAliyunOSSConfig = ({ .trim(), domain: z .string({ message: t("workflow_node.deploy.form.aliyun_oss_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormBaiduCloudCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormBaiduCloudCDNConfig.tsx index dd62594b..3302e0e9 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormBaiduCloudCDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormBaiduCloudCDNConfig.tsx @@ -33,7 +33,7 @@ const DeployNodeConfigFormBaiduCloudCDNConfig = ({ const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.baiducloud_cdn_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormBytePlusCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormBytePlusCDNConfig.tsx index b3ed4ac2..4cd93415 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormBytePlusCDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormBytePlusCDNConfig.tsx @@ -33,7 +33,7 @@ const DeployNodeConfigFormBytePlusCDNConfig = ({ const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.byteplus_cdn_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormQiniuCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormQiniuCDNConfig.tsx index f8e4faae..b2c4075f 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormQiniuCDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormQiniuCDNConfig.tsx @@ -27,7 +27,7 @@ const DeployNodeConfigFormQiniuCDNConfig = ({ form: formInst, formName, disabled const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.qiniu_cdn_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCDNConfig.tsx index 63c9c024..603904c0 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCDNConfig.tsx @@ -33,7 +33,7 @@ const DeployNodeConfigFormTencentCloudCDNConfig = ({ const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.tencentcloud_cdn_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCLBConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCLBConfig.tsx index a3f32aa9..e5d03116 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCLBConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudCLBConfig.tsx @@ -66,7 +66,7 @@ const DeployNodeConfigFormTencentCloudCLBConfig = ({ domain: z .string({ message: t("workflow_node.deploy.form.tencentcloud_clb_domain.placeholder") }) .nullish() - .refine((v) => RESOURCE_TYPE_RULEDOMAIN !== fieldResourceType || validDomainName(v!, true), t("common.errmsg.domain_invalid")), + .refine((v) => RESOURCE_TYPE_RULEDOMAIN !== fieldResourceType || validDomainName(v!, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudECDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudECDNConfig.tsx index ae4fd858..c8a2a84a 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudECDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormTencentCloudECDNConfig.tsx @@ -33,7 +33,7 @@ const DeployNodeConfigFormTencentCloudECDNConfig = ({ const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.tencentcloud_ecdn_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormVolcEngineCDNConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormVolcEngineCDNConfig.tsx index d73cb40c..c420e96e 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormVolcEngineCDNConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormVolcEngineCDNConfig.tsx @@ -33,7 +33,7 @@ const DeployNodeConfigFormVolcEngineCDNConfig = ({ const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.volcengine_cdn_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormVolcEngineLiveConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormVolcEngineLiveConfig.tsx index 7d6afed9..3845c1ac 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigFormVolcEngineLiveConfig.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigFormVolcEngineLiveConfig.tsx @@ -33,7 +33,7 @@ const DeployNodeConfigFormVolcEngineLiveConfig = ({ const formSchema = z.object({ domain: z .string({ message: t("workflow_node.deploy.form.volcengine_live_domain.placeholder") }) - .refine((v) => validDomainName(v, true), t("common.errmsg.domain_invalid")), + .refine((v) => validDomainName(v, { allowWildcard: true }), t("common.errmsg.domain_invalid")), }); const formRule = createSchemaFieldRule(formSchema); diff --git a/ui/src/utils/validators.ts b/ui/src/utils/validators.ts index a31c3ebc..94f8ae85 100644 --- a/ui/src/utils/validators.ts +++ b/ui/src/utils/validators.ts @@ -4,8 +4,8 @@ export const validCronExpression = (value: string) => { return _validCronExpression(value); }; -export const validDomainName = (value: string, wildcard = false) => { - const re = wildcard ? /^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{1,}$/ : /^(?!-)[A-Za-z0-9-]{1,}(? { + const re = allowWildcard ? /^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{1,}$/ : /^(?!-)[A-Za-z0-9-]{1,}(? Date: Wed, 8 Jan 2025 16:05:02 +0800 Subject: [PATCH 2/2] fix: incorrect nil check logic in tencentcloud cdn and ecdn deployment --- internal/deployer/providers.go | 2 +- internal/domain/provider.go | 2 +- .../deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go | 2 +- .../deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index be2feb32..62cc1313 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -210,7 +210,7 @@ func createDeployer(provider domain.DeployProviderType, accessConfig string, dep return deployer, logger, err } - case domain.DeployProviderTypeK8sSecret: + case domain.DeployProviderTypeKubernetesSecret: { access := &domain.AccessConfigForKubernetes{} if err := json.Unmarshal([]byte(accessConfig), access); err != nil { diff --git a/internal/domain/provider.go b/internal/domain/provider.go index a196d2c3..b0f9c05b 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -51,7 +51,7 @@ const ( DeployProviderTypeDogeCloudCDN = DeployProviderType("dogecloud-cdn") DeployProviderTypeHuaweiCloudCDN = DeployProviderType("huaweicloud-cdn") DeployProviderTypeHuaweiCloudELB = DeployProviderType("huaweicloud-elb") - DeployProviderTypeK8sSecret = DeployProviderType("k8s-secret") + DeployProviderTypeKubernetesSecret = DeployProviderType("k8s-secret") DeployProviderTypeLocal = DeployProviderType("local") DeployProviderTypeQiniuCDN = DeployProviderType("qiniu-cdn") DeployProviderTypeSSH = DeployProviderType("ssh") diff --git a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go index fac9dbae..7aee8434 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go @@ -147,7 +147,7 @@ func (d *TencentCloudCDNDeployer) getDomainsByCertificateId(cloudCertId string) } domains := make([]string, 0) - if describeCertDomainsResp.Response.Domains == nil { + if describeCertDomainsResp.Response.Domains != nil { for _, domain := range describeCertDomainsResp.Response.Domains { domains = append(domains, *domain) } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go index e8cbdbb3..29f6e33c 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go @@ -130,7 +130,7 @@ func (d *TencentCloudECDNDeployer) getDomainsByCertificateId(cloudCertId string) } domains := make([]string, 0) - if describeCertDomainsResp.Response.Domains == nil { + if describeCertDomainsResp.Response.Domains != nil { for _, domain := range describeCertDomainsResp.Response.Domains { domains = append(domains, *domain) }