mirror of
https://github.com/usual2970/certimate.git
synced 2025-06-08 05:29:51 +00:00
Modify code according to code suggestions
This commit is contained in:
parent
364ceb2399
commit
0004eac764
@ -22,8 +22,8 @@ type DeployerConfig struct {
|
|||||||
CloudName string `json:"cloudName,omitempty"`
|
CloudName string `json:"cloudName,omitempty"`
|
||||||
// Key Vault 名称。
|
// Key Vault 名称。
|
||||||
KeyVaultName string `json:"keyvaultName"`
|
KeyVaultName string `json:"keyvaultName"`
|
||||||
// Certificate 名称。
|
// Certificate 名称,可选。
|
||||||
CertificateName string `json:"certificateName"`
|
CertificateName string `json:"certificateName,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type DeployerProvider struct {
|
type DeployerProvider struct {
|
||||||
|
@ -157,7 +157,6 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe
|
|||||||
// 暂时的解决方法是,将 PEM 证书转换成 PFX 格式,然后再导入。
|
// 暂时的解决方法是,将 PEM 证书转换成 PFX 格式,然后再导入。
|
||||||
pfxCert, err := certutil.TransformCertificateFromPEMToPFX(certPem, privkeyPem, "")
|
pfxCert, err := certutil.TransformCertificateFromPEMToPFX(certPem, privkeyPem, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
u.logger.Error("failed to transform certificate from PEM to PFX", slog.String("certPem", certPem), slog.String("privkeyPem", privkeyPem))
|
|
||||||
return nil, xerrors.Wrap(err, "failed to transform certificate from PEM to PFX")
|
return nil, xerrors.Wrap(err, "failed to transform certificate from PEM to PFX")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ const DeployNodeConfigFormAzureKeyVaultConfig = ({
|
|||||||
.refine((v) =>{
|
.refine((v) =>{
|
||||||
if (!v) return true;
|
if (!v) return true;
|
||||||
return validAzureKeyVaultCertificateName(v);
|
return validAzureKeyVaultCertificateName(v);
|
||||||
}, t("common.errmsg.azure_keyvault_certificate_name_invalid")),
|
}, t("workflow_node.deploy.form.azure_keyvault_certificate_name.errmsg.invalid")),
|
||||||
});
|
});
|
||||||
const formRule = createSchemaFieldRule(formSchema);
|
const formRule = createSchemaFieldRule(formSchema);
|
||||||
|
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
"common.errmsg.port_invalid": "Please enter a valid port",
|
"common.errmsg.port_invalid": "Please enter a valid port",
|
||||||
"common.errmsg.ip_invalid": "Please enter a valid IP address",
|
"common.errmsg.ip_invalid": "Please enter a valid IP address",
|
||||||
"common.errmsg.url_invalid": "Please enter a valid URL",
|
"common.errmsg.url_invalid": "Please enter a valid URL",
|
||||||
"common.errmsg.azure_keyvault_certificate_name_invalid": "Certificate name can only contain letters, numbers, and hyphens (-), with a length limit of 1 to 127 characters",
|
|
||||||
|
|
||||||
"common.notifier.bark": "Bark",
|
"common.notifier.bark": "Bark",
|
||||||
"common.notifier.dingtalk": "DingTalk",
|
"common.notifier.dingtalk": "DingTalk",
|
||||||
|
@ -237,6 +237,7 @@
|
|||||||
"workflow_node.deploy.form.azure_keyvault_certificate_name.label": "Azure KeyVault certificate name (Optional)",
|
"workflow_node.deploy.form.azure_keyvault_certificate_name.label": "Azure KeyVault certificate name (Optional)",
|
||||||
"workflow_node.deploy.form.azure_keyvault_certificate_name.placeholder": "Please enter Azure KeyVault certificate name",
|
"workflow_node.deploy.form.azure_keyvault_certificate_name.placeholder": "Please enter Azure KeyVault certificate name",
|
||||||
"workflow_node.deploy.form.azure_keyvault_certificate_name.tooltip": "If not filled in, a default name with a timestamp will be automatically generated.",
|
"workflow_node.deploy.form.azure_keyvault_certificate_name.tooltip": "If not filled in, a default name with a timestamp will be automatically generated.",
|
||||||
|
"workflow_node.deploy.form.azure_keyvault_certificate_name.errmsg.invalid": "Certificate name can only contain letters, numbers, and hyphens (-), with a length limit of 1 to 127 characters",
|
||||||
"workflow_node.deploy.form.baiducloud_appblb_resource_type.label": "Resource type",
|
"workflow_node.deploy.form.baiducloud_appblb_resource_type.label": "Resource type",
|
||||||
"workflow_node.deploy.form.baiducloud_appblb_resource_type.placeholder": "Please select resource type",
|
"workflow_node.deploy.form.baiducloud_appblb_resource_type.placeholder": "Please select resource type",
|
||||||
"workflow_node.deploy.form.baiducloud_appblb_resource_type.option.loadbalancer.label": "BLB load balancer",
|
"workflow_node.deploy.form.baiducloud_appblb_resource_type.option.loadbalancer.label": "BLB load balancer",
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
"common.errmsg.port_invalid": "请输入正确的端口号",
|
"common.errmsg.port_invalid": "请输入正确的端口号",
|
||||||
"common.errmsg.ip_invalid": "请输入正确的 IP 地址",
|
"common.errmsg.ip_invalid": "请输入正确的 IP 地址",
|
||||||
"common.errmsg.url_invalid": "请输入正确的 URL 地址",
|
"common.errmsg.url_invalid": "请输入正确的 URL 地址",
|
||||||
"common.errmsg.azure_keyvault_certificate_name_invalid": "证书名称只能包含字母、数字和连字符(-),长度限制为 1 到 127 个字符",
|
|
||||||
|
|
||||||
"common.notifier.bark": "Bark",
|
"common.notifier.bark": "Bark",
|
||||||
"common.notifier.dingtalk": "钉钉",
|
"common.notifier.dingtalk": "钉钉",
|
||||||
|
@ -236,6 +236,7 @@
|
|||||||
"workflow_node.deploy.form.azure_keyvault_certificate_name.label": "Azure KeyVault 证书名称 (可选)",
|
"workflow_node.deploy.form.azure_keyvault_certificate_name.label": "Azure KeyVault 证书名称 (可选)",
|
||||||
"workflow_node.deploy.form.azure_keyvault_certificate_name.placeholder": "请输入 Azure KeyVault 证书名称",
|
"workflow_node.deploy.form.azure_keyvault_certificate_name.placeholder": "请输入 Azure KeyVault 证书名称",
|
||||||
"workflow_node.deploy.form.azure_keyvault_certificate_name.tooltip": "不填写时,会自动生成带时间戳的默认名称。",
|
"workflow_node.deploy.form.azure_keyvault_certificate_name.tooltip": "不填写时,会自动生成带时间戳的默认名称。",
|
||||||
|
"workflow_node.deploy.form.azure_keyvault_certificate_name.errmsg.invalid": "证书名称只能包含字母、数字和连字符(-),长度限制为 1 到 127 个字符",
|
||||||
"workflow_node.deploy.form.baiducloud_appblb_resource_type.label": "证书替换方式",
|
"workflow_node.deploy.form.baiducloud_appblb_resource_type.label": "证书替换方式",
|
||||||
"workflow_node.deploy.form.baiducloud_appblb_resource_type.placeholder": "请选择证书替换方式",
|
"workflow_node.deploy.form.baiducloud_appblb_resource_type.placeholder": "请选择证书替换方式",
|
||||||
"workflow_node.deploy.form.baiducloud_appblb_resource_type.option.loadbalancer.label": "替换指定负载均衡器下的全部 HTTPS/SSL 监听的证书",
|
"workflow_node.deploy.form.baiducloud_appblb_resource_type.option.loadbalancer.label": "替换指定负载均衡器下的全部 HTTPS/SSL 监听的证书",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user