mirror of
https://github.com/woodchen-ink/certimate.git
synced 2025-07-18 01:11:55 +08:00
fix: #835
This commit is contained in:
parent
d6882cbc4f
commit
3162673b9d
@ -1251,7 +1251,7 @@ func createSSLDeployerProvider(options *deployerProviderOptions) (core.SSLDeploy
|
||||
SecretId: access.SecretId,
|
||||
SecretKey: access.SecretKey,
|
||||
Endpoint: xmaps.GetString(options.ProviderServiceConfig, "endpoint"),
|
||||
CertificiateId: xmaps.GetString(options.ProviderServiceConfig, "certificiateId"),
|
||||
CertificateId: xmaps.GetString(options.ProviderServiceConfig, "certificateId"),
|
||||
IsReplaced: xmaps.GetBool(options.ProviderServiceConfig, "isReplaced"),
|
||||
ResourceTypes: xslices.Filter(strings.Split(xmaps.GetString(options.ProviderServiceConfig, "resourceTypes"), ";"), func(s string) bool { return s != "" }),
|
||||
ResourceRegions: xslices.Filter(strings.Split(xmaps.GetString(options.ProviderServiceConfig, "resourceRegions"), ";"), func(s string) bool { return s != "" }),
|
||||
|
@ -24,7 +24,7 @@ type SSLDeployerProviderConfig struct {
|
||||
// 腾讯云接口端点。
|
||||
Endpoint string `json:"endpoint,omitempty"`
|
||||
// 原证书 ID。
|
||||
CertificiateId string `json:"certificateId"`
|
||||
CertificateId string `json:"certificateId"`
|
||||
// 是否替换原有证书(即保持原证书 ID 不变)。
|
||||
IsReplaced bool `json:"isReplaced,omitempty"`
|
||||
// 云资源类型数组。
|
||||
@ -80,7 +80,7 @@ func (d *SSLDeployerProvider) SetLogger(logger *slog.Logger) {
|
||||
}
|
||||
|
||||
func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*core.SSLDeployResult, error) {
|
||||
if d.config.CertificiateId == "" {
|
||||
if d.config.CertificateId == "" {
|
||||
return nil, errors.New("config `certificateId` is required")
|
||||
}
|
||||
if len(d.config.ResourceTypes) == 0 {
|
||||
@ -120,7 +120,7 @@ func (d *SSLDeployerProvider) executeUpdateCertificateInstance(ctx context.Conte
|
||||
}
|
||||
|
||||
updateCertificateInstanceReq := tcssl.NewUpdateCertificateInstanceRequest()
|
||||
updateCertificateInstanceReq.OldCertificateId = common.StringPtr(d.config.CertificiateId)
|
||||
updateCertificateInstanceReq.OldCertificateId = common.StringPtr(d.config.CertificateId)
|
||||
updateCertificateInstanceReq.CertificateId = common.StringPtr(upres.CertId)
|
||||
updateCertificateInstanceReq.ResourceTypes = common.StringPtrs(d.config.ResourceTypes)
|
||||
updateCertificateInstanceReq.ResourceTypesRegions = wrapResourceTypeRegions(d.config.ResourceTypes, d.config.ResourceRegions)
|
||||
@ -198,7 +198,7 @@ func (d *SSLDeployerProvider) executeUploadUpdateCertificateInstance(ctx context
|
||||
}
|
||||
|
||||
uploadUpdateCertificateInstanceReq := tcssl.NewUploadUpdateCertificateInstanceRequest()
|
||||
uploadUpdateCertificateInstanceReq.OldCertificateId = common.StringPtr(d.config.CertificiateId)
|
||||
uploadUpdateCertificateInstanceReq.OldCertificateId = common.StringPtr(d.config.CertificateId)
|
||||
uploadUpdateCertificateInstanceReq.CertificatePublicKey = common.StringPtr(certPEM)
|
||||
uploadUpdateCertificateInstanceReq.CertificatePrivateKey = common.StringPtr(privkeyPEM)
|
||||
uploadUpdateCertificateInstanceReq.ResourceTypes = common.StringPtrs(d.config.ResourceTypes)
|
||||
|
@ -49,12 +49,15 @@ const DeployNodeConfigFormTencentCloudSSLUpdateConfig = ({
|
||||
.split(MULTIPLE_INPUT_SEPARATOR)
|
||||
.every((e) => !!e.trim());
|
||||
}, t("workflow_node.deploy.form.tencentcloud_ssl_update_resource_types.placeholder")),
|
||||
resourceRegions: z.string(t("workflow_node.deploy.form.tencentcloud_ssl_update_resource_regions.placeholder")).refine((v) => {
|
||||
if (!v) return false;
|
||||
return String(v)
|
||||
.split(MULTIPLE_INPUT_SEPARATOR)
|
||||
.every((e) => !!e.trim());
|
||||
}, t("workflow_node.deploy.form.tencentcloud_ssl_update_resource_regions.placeholder")),
|
||||
resourceRegions: z
|
||||
.string(t("workflow_node.deploy.form.tencentcloud_ssl_update_resource_regions.placeholder"))
|
||||
.nullish()
|
||||
.refine((v) => {
|
||||
if (!v) return true;
|
||||
return String(v)
|
||||
.split(MULTIPLE_INPUT_SEPARATOR)
|
||||
.every((e) => !!e.trim());
|
||||
}, t("workflow_node.deploy.form.tencentcloud_ssl_update_resource_regions.placeholder")),
|
||||
isReplaced: z.boolean().nullish(),
|
||||
});
|
||||
const formRule = createSchemaFieldRule(formSchema);
|
||||
|
Loading…
x
Reference in New Issue
Block a user