Merge branch 'main' into feat/cloud-load-balance

ui/src/components/certimate/DeployEditDialog.tsx

@@ -12,6 +12,7 @@ import { Context as DeployEditContext } from "./DeployEdit";
 import DeployToAliyunOSS from "./DeployToAliyunOSS";
 import DeployToAliyunCDN from "./DeployToAliyunCDN";
 import DeployToTencentCDN from "./DeployToTencentCDN";
+import DeployToTencentCLB from "./DeployToTencentCLB";
 import DeployToTencentCOS from "./DeployToTencentCOS";
 import DeployToHuaweiCloudCDN from "./DeployToHuaweiCloudCDN";
 import DeployToHuaweiCloudELB from "./DeployToHuaweiCloudELB";
@@ -120,6 +121,9 @@ const DeployEditDialog = ({ trigger, deployConfig, onSave }: DeployEditDialogPro
     case "tencent-cdn":
       childComponent = <DeployToTencentCDN />;
       break;
+    case "tencent-clb":
+      childComponent = <DeployToTencentCLB />;
+      break;
     case "tencent-cos":
       childComponent = <DeployToTencentCOS />;
       break;

ui/src/components/certimate/DeployToQiniuCDN.tsx

@@ -49,7 +49,7 @@ const DeployToQiniuCDN = () => {
   return (
     <div className="flex flex-col space-y-8">
       <div>
-        <Label>{t("domain.deployment.form.domain.label")}</Label>
+        <Label>{t("domain.deployment.form.domain.label.wildsupported")}</Label>
         <Input
           placeholder={t("domain.deployment.form.domain.placeholder")}
           className="w-full mt-1"

ui/src/components/certimate/DeployToTencentCDN.tsx

@@ -38,7 +38,7 @@ const DeployToTencentCDN = () => {
   return (
     <div className="flex flex-col space-y-8">
       <div>
-        <Label>{t("domain.deployment.form.domain.label")}</Label>
+        <Label>{t("domain.deployment.form.domain.label.wildsupported")}</Label>
         <Input
           placeholder={t("domain.deployment.form.domain.placeholder")}
           className="w-full mt-1"

ui/src/components/certimate/DeployToTencentCLB.tsx

@@ -0,0 +1,250 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToTencentCLB = () => {
+  const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    setError({});
+  }, []);
+
+  useEffect(() => {
+    const resp = domainSchema.safeParse(data.config?.domain);
+    if (!resp.success) {
+      setError({
+        ...error,
+        domain: JSON.parse(resp.error.message)[0].message,
+      });
+    } else {
+      setError({
+        ...error,
+        domain: "",
+      });
+    }
+  }, [data]);
+
+  useEffect(() => {
+    const clbIdresp = clbIdSchema.safeParse(data.config?.clbId);
+    if (!clbIdresp.success) {
+      setError({
+        ...error,
+        clbId: JSON.parse(clbIdresp.error.message)[0].message,
+      });
+    } else {
+      setError({
+        ...error,
+        clbId: "",
+      });
+    }
+  }, [data]);
+
+  useEffect(() => {
+    const lsnIdresp = lsnIdSchema.safeParse(data.config?.lsnId);
+    if (!lsnIdresp.success) {
+      setError({
+        ...error,
+        lsnId: JSON.parse(lsnIdresp.error.message)[0].message,
+      });
+    } else {
+      setError({
+        ...error,
+        lsnId: "",
+      });
+    }
+  }, [data]);
+
+  useEffect(() => {
+    const regionResp = regionSchema.safeParse(data.config?.region);
+    if (!regionResp.success) {
+      setError({
+        ...error,
+        region: JSON.parse(regionResp.error.message)[0].message,
+      });
+    } else {
+      setError({
+        ...error,
+        region: "",
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    if (!data.id) {
+      setDeploy({
+        ...data,
+        config: {
+          lsnId: "",
+          clbId: "",
+          domain: "",
+          region: "",
+        },
+      });
+    }
+  }, []);
+
+  const regionSchema = z.string().regex(/^ap-[a-z]+$/, {
+    message: t("domain.deployment.form.tencent_clb_region.placeholder"),
+  });
+
+  const domainSchema = z.string().regex(/^$|^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
+    message: t("common.errmsg.domain_invalid"),
+  });
+
+  const clbIdSchema = z.string().regex(/^lb-[a-zA-Z0-9]{8}$/, {
+    message: t("domain.deployment.form.tencent_clb_id.placeholder"),
+  });
+
+  const lsnIdSchema = z.string().regex(/^lbl-.{8}$/, {
+    message: t("domain.deployment.form.tencent_clb_listener.placeholder"),
+  });
+
+  return (
+    <div className="flex flex-col space-y-8">
+      <div>
+        <Label>{t("domain.deployment.form.tencent_clb_region.label")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.tencent_clb_region.placeholder")}
+          className="w-full mt-1"
+          value={data?.config?.region}
+          onChange={(e) => {
+            const temp = e.target.value;
+
+            const resp = regionSchema.safeParse(temp);
+            if (!resp.success) {
+              setError({
+                ...error,
+                region: JSON.parse(resp.error.message)[0].message,
+              });
+            } else {
+              setError({
+                ...error,
+                region: "",
+              });
+            }
+
+            const newData = produce(data, (draft) => {
+              if (!draft.config) {
+                draft.config = {};
+              }
+              draft.config.region = temp;
+            });
+            setDeploy(newData);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{error?.region}</div>
+      </div>
+
+      <div>
+        <Label>{t("domain.deployment.form.tencent_clb_id.label")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.tencent_clb_id.placeholder")}
+          className="w-full mt-1"
+          value={data?.config?.clbId}
+          onChange={(e) => {
+            const temp = e.target.value;
+
+            const resp = clbIdSchema.safeParse(temp);
+            if (!resp.success) {
+              setError({
+                ...error,
+                clbId: JSON.parse(resp.error.message)[0].message,
+              });
+            } else {
+              setError({
+                ...error,
+                clbId: "",
+              });
+            }
+
+            const newData = produce(data, (draft) => {
+              if (!draft.config) {
+                draft.config = {};
+              }
+              draft.config.clbId = temp;
+            });
+            setDeploy(newData);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{error?.clbId}</div>
+      </div>
+
+      <div>
+        <Label>{t("domain.deployment.form.tencent_clb_listener.label")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.tencent_clb_listener.placeholder")}
+          className="w-full mt-1"
+          value={data?.config?.lsnId}
+          onChange={(e) => {
+            const temp = e.target.value;
+
+            const resp = lsnIdSchema.safeParse(temp);
+            if (!resp.success) {
+              setError({
+                ...error,
+                lsnId: JSON.parse(resp.error.message)[0].message,
+              });
+            } else {
+              setError({
+                ...error,
+                lsnId: "",
+              });
+            }
+
+            const newData = produce(data, (draft) => {
+              if (!draft.config) {
+                draft.config = {};
+              }
+              draft.config.lsnId = temp;
+            });
+            setDeploy(newData);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{error?.lsnId}</div>
+      </div>
+
+      <div>
+        <Label>{t("domain.deployment.form.tencent_clb_domain.label")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.tencent_clb_domain.placeholder")}
+          className="w-full mt-1"
+          value={data?.config?.domain}
+          onChange={(e) => {
+            const temp = e.target.value;
+
+            const resp = domainSchema.safeParse(temp);
+            if (!resp.success) {
+              setError({
+                ...error,
+                domain: JSON.parse(resp.error.message)[0].message,
+              });
+            } else {
+              setError({
+                ...error,
+                domain: "",
+              });
+            }
+
+            const newData = produce(data, (draft) => {
+              if (!draft.config) {
+                draft.config = {};
+              }
+              draft.config.domain = temp;
+            });
+            setDeploy(newData);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{error?.domain}</div>
+      </div>
+    </div>
+  );
+};
+
+export default DeployToTencentCLB;

ui/src/components/certimate/DeployToTencentCOS.tsx

@@ -32,7 +32,7 @@ const DeployToTencentCOS = () => {
   }, [data]);
 
   useEffect(() => {
-    const bucketResp = bucketSchema.safeParse(data.config?.domain);
+    const bucketResp = bucketSchema.safeParse(data.config?.bucket);
     if (!bucketResp.success) {
       setError({
         ...error,
@@ -46,6 +46,21 @@ const DeployToTencentCOS = () => {
     }
   }, []);
 
+  useEffect(() => {
+    const regionResp = regionSchema.safeParse(data.config?.region);
+    if (!regionResp.success) {
+      setError({
+        ...error,
+        region: JSON.parse(regionResp.error.message)[0].message,
+      });
+    } else {
+      setError({
+        ...error,
+        region: "",
+      });
+    }
+  }, []);
+
   useEffect(() => {
     if (!data.id) {
       setDeploy({
@@ -63,8 +78,12 @@ const DeployToTencentCOS = () => {
     message: t("common.errmsg.domain_invalid"),
   });
 
-  const bucketSchema = z.string().min(1, {
-    message: t("domain.deployment.form.tencent_cos_region.placeholder"),
+  const regionSchema = z.string().regex(/^ap-[a-z]+$/, {
+    message: t("domain.deployment.form.cos_region.placeholder"),
+  });
+
+  const bucketSchema = z.string().regex(/^.+-\d+$/, {
+    message: t("domain.deployment.form.cos_bucket.placeholder"),
   });
 
   return (
@@ -78,6 +97,19 @@ const DeployToTencentCOS = () => {
           onChange={(e) => {
             const temp = e.target.value;
 
+            const resp = bucketSchema.safeParse(temp);
+            if (!resp.success) {
+              setError({
+                ...error,
+                region: JSON.parse(resp.error.message)[0].message,
+              });
+            } else {
+              setError({
+                ...error,
+                region: "",
+              });
+            }
+
             const newData = produce(data, (draft) => {
               if (!draft.config) {
                 draft.config = {};
@@ -87,7 +119,7 @@ const DeployToTencentCOS = () => {
             setDeploy(newData);
           }}
         />
-        <div className="text-red-600 text-sm mt-1">{error?.endpoint}</div>
+        <div className="text-red-600 text-sm mt-1">{error?.region}</div>
       </div>
 
       <div>
@@ -127,7 +159,7 @@ const DeployToTencentCOS = () => {
       <div>
         <Label>{t("domain.deployment.form.domain.label")}</Label>
         <Input
-          placeholder={t("domain.deployment.form.domain.label")}
+          placeholder={t("domain.deployment.form.domain.placeholder")}
           className="w-full mt-1"
           value={data?.config?.domain}
           onChange={(e) => {