diff --git a/internal/certmgmt/deployers/sp_1panel.go b/internal/certmgmt/deployers/sp_1panel.go index 2677d65c8..79a622dc6 100644 --- a/internal/certmgmt/deployers/sp_1panel.go +++ b/internal/certmgmt/deployers/sp_1panel.go @@ -22,7 +22,7 @@ func init() { ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, NodeName: xmaps.GetString(options.ProviderExtendedConfig, "nodeName"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), WebsiteMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "websiteMatchPattern"), WebsiteId: xmaps.GetInt64(options.ProviderExtendedConfig, "websiteId"), CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), diff --git a/internal/certmgmt/deployers/sp_aliyun_alb.go b/internal/certmgmt/deployers/sp_aliyun_alb.go index ec480feab..a06360be6 100644 --- a/internal/certmgmt/deployers/sp_aliyun_alb.go +++ b/internal/certmgmt/deployers/sp_aliyun_alb.go @@ -21,7 +21,7 @@ func init() { AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_aliyun_clb.go b/internal/certmgmt/deployers/sp_aliyun_clb.go index 33a2296ef..047059598 100644 --- a/internal/certmgmt/deployers/sp_aliyun_clb.go +++ b/internal/certmgmt/deployers/sp_aliyun_clb.go @@ -21,7 +21,7 @@ func init() { AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerPort: xmaps.GetOrDefaultInt32(options.ProviderExtendedConfig, "listenerPort", 443), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_aliyun_ga.go b/internal/certmgmt/deployers/sp_aliyun_ga.go index 86073324a..15004dea5 100644 --- a/internal/certmgmt/deployers/sp_aliyun_ga.go +++ b/internal/certmgmt/deployers/sp_aliyun_ga.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), AcceleratorId: xmaps.GetString(options.ProviderExtendedConfig, "acceleratorId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_aliyun_nlb.go b/internal/certmgmt/deployers/sp_aliyun_nlb.go index aef2c66d3..7b2dfc0ed 100644 --- a/internal/certmgmt/deployers/sp_aliyun_nlb.go +++ b/internal/certmgmt/deployers/sp_aliyun_nlb.go @@ -21,7 +21,7 @@ func init() { AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) diff --git a/internal/certmgmt/deployers/sp_apisix.go b/internal/certmgmt/deployers/sp_apisix.go index 458f35d16..1d932eb3b 100644 --- a/internal/certmgmt/deployers/sp_apisix.go +++ b/internal/certmgmt/deployers/sp_apisix.go @@ -20,7 +20,7 @@ func init() { ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_baiducloud_appblb.go b/internal/certmgmt/deployers/sp_baiducloud_appblb.go index c9fe235d0..383faeebe 100644 --- a/internal/certmgmt/deployers/sp_baiducloud_appblb.go +++ b/internal/certmgmt/deployers/sp_baiducloud_appblb.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerPort: xmaps.GetInt32(options.ProviderExtendedConfig, "listenerPort"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_baiducloud_blb.go b/internal/certmgmt/deployers/sp_baiducloud_blb.go index b71e3b66c..6196ab528 100644 --- a/internal/certmgmt/deployers/sp_baiducloud_blb.go +++ b/internal/certmgmt/deployers/sp_baiducloud_blb.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerPort: xmaps.GetInt32(options.ProviderExtendedConfig, "listenerPort"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_baishan_cdn.go b/internal/certmgmt/deployers/sp_baishan_cdn.go index 5f05594c4..58cbf4d34 100644 --- a/internal/certmgmt/deployers/sp_baishan_cdn.go +++ b/internal/certmgmt/deployers/sp_baishan_cdn.go @@ -18,7 +18,7 @@ func init() { provider, err := baishancdn.NewDeployer(&baishancdn.DeployerConfig{ ApiToken: credentials.ApiToken, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), diff --git a/internal/certmgmt/deployers/sp_cdnfly.go b/internal/certmgmt/deployers/sp_cdnfly.go index 99b700278..7c0fe3b33 100644 --- a/internal/certmgmt/deployers/sp_cdnfly.go +++ b/internal/certmgmt/deployers/sp_cdnfly.go @@ -21,7 +21,7 @@ func init() { ApiKey: credentials.ApiKey, ApiSecret: credentials.ApiSecret, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), SiteId: xmaps.GetString(options.ProviderExtendedConfig, "siteId"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) diff --git a/internal/certmgmt/deployers/sp_cpanel.go b/internal/certmgmt/deployers/sp_cpanel.go index b8caaeb2c..1c9e59d0d 100644 --- a/internal/certmgmt/deployers/sp_cpanel.go +++ b/internal/certmgmt/deployers/sp_cpanel.go @@ -21,7 +21,7 @@ func init() { Username: credentials.Username, ApiToken: credentials.ApiToken, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_ctcccloud_elb.go b/internal/certmgmt/deployers/sp_ctcccloud_elb.go index 60329bfe8..7159146b9 100644 --- a/internal/certmgmt/deployers/sp_ctcccloud_elb.go +++ b/internal/certmgmt/deployers/sp_ctcccloud_elb.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) diff --git a/internal/certmgmt/deployers/sp_flexcdn.go b/internal/certmgmt/deployers/sp_flexcdn.go index b7b25dabe..883ca671a 100644 --- a/internal/certmgmt/deployers/sp_flexcdn.go +++ b/internal/certmgmt/deployers/sp_flexcdn.go @@ -22,7 +22,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, AccessKey: credentials.AccessKey, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_goedge.go b/internal/certmgmt/deployers/sp_goedge.go index 83b91ac47..8256acfdf 100644 --- a/internal/certmgmt/deployers/sp_goedge.go +++ b/internal/certmgmt/deployers/sp_goedge.go @@ -22,7 +22,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, AccessKey: credentials.AccessKey, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_huaweicloud_apig.go b/internal/certmgmt/deployers/sp_huaweicloud_apig.go index e980af09b..b04d0713a 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_apig.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_apig.go @@ -21,7 +21,7 @@ func init() { SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_huaweicloud_elb.go b/internal/certmgmt/deployers/sp_huaweicloud_elb.go index 35297f8fc..01c0a734f 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_elb.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_elb.go @@ -21,7 +21,7 @@ func init() { SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), diff --git a/internal/certmgmt/deployers/sp_huaweicloud_waf.go b/internal/certmgmt/deployers/sp_huaweicloud_waf.go index 3c904ec3a..bd069d867 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_waf.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_waf.go @@ -21,7 +21,7 @@ func init() { SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) diff --git a/internal/certmgmt/deployers/sp_jdcloud_alb.go b/internal/certmgmt/deployers/sp_jdcloud_alb.go index b42dd3c47..1190e6e6e 100644 --- a/internal/certmgmt/deployers/sp_jdcloud_alb.go +++ b/internal/certmgmt/deployers/sp_jdcloud_alb.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) diff --git a/internal/certmgmt/deployers/sp_kong.go b/internal/certmgmt/deployers/sp_kong.go index 8d5ba672a..8134d12a5 100644 --- a/internal/certmgmt/deployers/sp_kong.go +++ b/internal/certmgmt/deployers/sp_kong.go @@ -20,7 +20,7 @@ func init() { ServerUrl: credentials.ServerUrl, ApiToken: credentials.ApiToken, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), Workspace: xmaps.GetString(options.ProviderExtendedConfig, "workspace"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) diff --git a/internal/certmgmt/deployers/sp_ksyun_cdn.go b/internal/certmgmt/deployers/sp_ksyun_cdn.go index 8d58035e7..2ad9a4681 100644 --- a/internal/certmgmt/deployers/sp_ksyun_cdn.go +++ b/internal/certmgmt/deployers/sp_ksyun_cdn.go @@ -19,7 +19,7 @@ func init() { provider, err := ksyuncdn.NewDeployer(&ksyuncdn.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), diff --git a/internal/certmgmt/deployers/sp_ksyun_slb.go b/internal/certmgmt/deployers/sp_ksyun_slb.go index 0e5a8d124..b37eb62cd 100644 --- a/internal/certmgmt/deployers/sp_ksyun_slb.go +++ b/internal/certmgmt/deployers/sp_ksyun_slb.go @@ -19,7 +19,7 @@ func init() { provider, err := ksyunslb.NewDeployer(&ksyunslb.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_lecdn.go b/internal/certmgmt/deployers/sp_lecdn.go index 08c5d9987..25a106235 100644 --- a/internal/certmgmt/deployers/sp_lecdn.go +++ b/internal/certmgmt/deployers/sp_lecdn.go @@ -23,7 +23,7 @@ func init() { Username: credentials.Username, Password: credentials.Password, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), ClientId: xmaps.GetInt64(options.ProviderExtendedConfig, "clientId"), }) diff --git a/internal/certmgmt/deployers/sp_netlify.go b/internal/certmgmt/deployers/sp_netlify.go index 7c4b68bbc..f439256c4 100644 --- a/internal/certmgmt/deployers/sp_netlify.go +++ b/internal/certmgmt/deployers/sp_netlify.go @@ -18,7 +18,7 @@ func init() { provider, err := netlify.NewDeployer(&netlify.DeployerConfig{ ApiToken: credentials.ApiToken, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), SiteId: xmaps.GetString(options.ProviderExtendedConfig, "siteId"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_nginxproxymanager.go b/internal/certmgmt/deployers/sp_nginxproxymanager.go index f88ce01a1..2937186b1 100644 --- a/internal/certmgmt/deployers/sp_nginxproxymanager.go +++ b/internal/certmgmt/deployers/sp_nginxproxymanager.go @@ -23,7 +23,7 @@ func init() { Password: credentials.Password, ApiToken: credentials.ApiToken, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), HostType: xmaps.GetString(options.ProviderExtendedConfig, "hostType"), HostMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "hostMatchPattern"), HostId: xmaps.GetInt64(options.ProviderExtendedConfig, "hostId"), diff --git a/internal/certmgmt/deployers/sp_ratpanel.go b/internal/certmgmt/deployers/sp_ratpanel.go index d47b18bf2..889fb38c3 100644 --- a/internal/certmgmt/deployers/sp_ratpanel.go +++ b/internal/certmgmt/deployers/sp_ratpanel.go @@ -24,7 +24,7 @@ func init() { AccessTokenId: credentials.AccessTokenId, AccessToken: credentials.AccessToken, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), SiteNames: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "siteNames"), ";"), func(s string, _ int) bool { return s != "" }), CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) diff --git a/internal/certmgmt/deployers/sp_safeline.go b/internal/certmgmt/deployers/sp_safeline.go index e5339ad9c..15bf2e680 100644 --- a/internal/certmgmt/deployers/sp_safeline.go +++ b/internal/certmgmt/deployers/sp_safeline.go @@ -20,7 +20,7 @@ func init() { ServerUrl: credentials.ServerUrl, ApiToken: credentials.ApiToken, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_samwaf.go b/internal/certmgmt/deployers/sp_samwaf.go index 617409ef8..ba1940123 100644 --- a/internal/certmgmt/deployers/sp_samwaf.go +++ b/internal/certmgmt/deployers/sp_samwaf.go @@ -20,7 +20,7 @@ func init() { ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return provider, err diff --git a/internal/certmgmt/deployers/sp_tencentcloud_clb.go b/internal/certmgmt/deployers/sp_tencentcloud_clb.go index 385ffc2a9..60aad6b1e 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_clb.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_clb.go @@ -21,7 +21,7 @@ func init() { SecretKey: credentials.SecretKey, Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_tencentcloud_gaap.go b/internal/certmgmt/deployers/sp_tencentcloud_gaap.go index 6c0570719..47c72b92b 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_gaap.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_gaap.go @@ -20,7 +20,7 @@ func init() { SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), ProxyId: xmaps.GetString(options.ProviderExtendedConfig, "proxyId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) diff --git a/internal/certmgmt/deployers/sp_ucloud_ualb.go b/internal/certmgmt/deployers/sp_ucloud_ualb.go index 22d7e40d2..9a111888f 100644 --- a/internal/certmgmt/deployers/sp_ucloud_ualb.go +++ b/internal/certmgmt/deployers/sp_ucloud_ualb.go @@ -21,7 +21,7 @@ func init() { PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_ucloud_uclb.go b/internal/certmgmt/deployers/sp_ucloud_uclb.go index b0a5bfb25..881780e03 100644 --- a/internal/certmgmt/deployers/sp_ucloud_uclb.go +++ b/internal/certmgmt/deployers/sp_ucloud_uclb.go @@ -21,7 +21,7 @@ func init() { PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), VServerId: xmaps.GetString(options.ProviderExtendedConfig, "vserverId"), }) diff --git a/internal/certmgmt/deployers/sp_volcengine_alb.go b/internal/certmgmt/deployers/sp_volcengine_alb.go index 44bba0743..ae306cbae 100644 --- a/internal/certmgmt/deployers/sp_volcengine_alb.go +++ b/internal/certmgmt/deployers/sp_volcengine_alb.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_volcengine_clb.go b/internal/certmgmt/deployers/sp_volcengine_clb.go index ed69d9ed8..959b02197 100644 --- a/internal/certmgmt/deployers/sp_volcengine_clb.go +++ b/internal/certmgmt/deployers/sp_volcengine_clb.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) diff --git a/internal/certmgmt/deployers/sp_zenlayer_cdn.go b/internal/certmgmt/deployers/sp_zenlayer_cdn.go index 84d6ed980..82a0cd460 100644 --- a/internal/certmgmt/deployers/sp_zenlayer_cdn.go +++ b/internal/certmgmt/deployers/sp_zenlayer_cdn.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, AccessKeyPassword: credentials.AccessKeyPassword, ResourceGroupId: credentials.ResourceGroupId, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), diff --git a/internal/certmgmt/deployers/sp_zenlayer_ga.go b/internal/certmgmt/deployers/sp_zenlayer_ga.go index a75ff0bed..1d0970803 100644 --- a/internal/certmgmt/deployers/sp_zenlayer_ga.go +++ b/internal/certmgmt/deployers/sp_zenlayer_ga.go @@ -20,7 +20,7 @@ func init() { AccessKeyId: credentials.AccessKeyId, AccessKeyPassword: credentials.AccessKeyPassword, ResourceGroupId: credentials.ResourceGroupId, - ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), AcceleratorId: xmaps.GetString(options.ProviderExtendedConfig, "acceleratorId"), CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) diff --git a/migrations/1779206400_upgrade_v0.4.23.go b/migrations/1779206400_upgrade_v0.4.23.go new file mode 100644 index 000000000..56a9a25ff --- /dev/null +++ b/migrations/1779206400_upgrade_v0.4.23.go @@ -0,0 +1,155 @@ +package migrations + +import ( + "github.com/pocketbase/pocketbase/core" + m "github.com/pocketbase/pocketbase/migrations" + + snaps "github.com/certimate-go/certimate/migrations/snaps/v0.4" +) + +func init() { + m.Register(func(app core.App) error { + tracer := NewTracer("v0.4.23") + tracer.Printf("go ...") + + // adapt to new workflow data structure + { + walker := &snaps.WorkflowGraphWalker{} + walker.Define(func(node *snaps.WorkflowNode) (_changed bool, _err error) { + _changed = false + _err = nil + + if node.Type != "bizDeploy" { + return + } + + nodeCfg := node.Data.Config + + switch nodeCfg["provider"] { + case + "1panel", + "aliyun-alb", + "aliyun-clb", + "aliyun-ga", + "aliyun-nlb", + "apisix", + "baiducloud-appblb", + "baiducloud-blb", + "baishan-cdn", + "cdnfly", + "cpanel", + "ctcccloud-elb", + "flexcdn", + "goedge", + "huaweicloud-apig", + "huaweicloud-elb", + "huaweicloud-waf", + "jdcloud-alb", + "kong", + "ksyun-cdn", + "ksyun-slb", + "lecdn", + "netlify", + "nginxproxymanager", + "ratpanel", + "safeline", + "samwaf", + "tencentcloud-clb", + "tencentcloud-gaap", + "ucloud-uclb", + "volcengine-alb", + "volcengine-clb", + "zenlayer-cdn", + "zenlayer-ga": + { + if providerCfg, ok := nodeCfg["providerConfig"].(map[string]any); ok { + providerCfg["deployTarget"] = providerCfg["resourceType"] + delete(providerCfg, "resourceType") + nodeCfg["providerConfig"] = providerCfg + + _changed = true + return + } + } + } + + return + }) + + // update collection `workflow` + // - migrate field `graphDraft` / `graphContent` + { + collection, err := app.FindCollectionByNameOrId("tovyif5ax6j62ur") + if err != nil { + return err + } + + records, err := app.FindAllRecords(collection) + if err != nil { + return err + } + + for _, record := range records { + changed := false + + if ret, err := walker.Migrate(record, "graphDraft"); err != nil { + return err + } else { + changed = changed || ret + } + + if ret, err := walker.Migrate(record, "graphContent"); err != nil { + return err + } else { + changed = changed || ret + } + + if changed { + if err := app.Save(record); err != nil { + return err + } + + tracer.Printf("record #%s in collection '%s' updated", record.Id, collection.Name) + } + } + } + + // update collection `workflow_run` + // - migrate field `graph` + { + collection, err := app.FindCollectionByNameOrId("qjp8lygssgwyqyz") + if err != nil { + return err + } + + records, err := app.FindAllRecords(collection) + if err != nil { + return err + } + + for _, record := range records { + changed := false + + if ret, err := walker.Migrate(record, "graph"); err != nil { + return err + } else { + changed = changed || ret + } + + if changed { + if err := app.Save(record); err != nil { + return err + } + + tracer.Printf("record #%s in collection '%s' updated", record.Id, collection.Name) + } + } + } + } + + tracer.Printf("done") + return nil + }, func(app core.App) error { + return nil + }) +} diff --git a/pkg/core/deployer/providers/1panel/1panel.go b/pkg/core/deployer/providers/1panel/1panel.go index 2534f5072..9abe1e1fa 100644 --- a/pkg/core/deployer/providers/1panel/1panel.go +++ b/pkg/core/deployer/providers/1panel/1panel.go @@ -31,16 +31,16 @@ type DeployerConfig struct { // 子节点名称。 // 选填。 NodeName string `json:"nodeName,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 域名匹配模式。 // 零值时默认值 [WEBSITE_MATCH_PATTERN_SPECIFIED]。 WebsiteMatchPattern string `json:"websiteMatchPattern,omitempty"` // 网站 ID。 - // 部署资源类型为 [RESOURCE_TYPE_WEBSITE]、且匹配模式非 [WEBSITE_MATCH_PATTERN_CERTSAN] 时必填。 + // 部署目标为 [DEPLOY_TARGET_WEBSITE]、且匹配模式非 [WEBSITE_MATCH_PATTERN_CERTSAN] 时必填。 WebsiteId int64 `json:"websiteId,omitempty"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId int64 `json:"certificateId,omitempty"` } @@ -93,20 +93,20 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_WEBSITE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_WEBSITE: if err := d.deployToWebsite(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/1panel/1panel_test.go b/pkg/core/deployer/providers/1panel/1panel_test.go index 92d9282cd..8d68ebc28 100644 --- a/pkg/core/deployer/providers/1panel/1panel_test.go +++ b/pkg/core/deployer/providers/1panel/1panel_test.go @@ -49,7 +49,7 @@ func TestProvider(t *testing.T) { ApiVersion: fApiVersion, ApiKey: fApiKey, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_WEBSITE, + DeployTarget: impl.DEPLOY_TARGET_WEBSITE, WebsiteMatchPattern: impl.WEBSITE_MATCH_PATTERN_SPECIFIED, WebsiteId: fWebsiteId, }) @@ -67,7 +67,7 @@ func TestProvider(t *testing.T) { ApiVersion: fApiVersion, ApiKey: fApiKey, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/1panel/consts.go b/pkg/core/deployer/providers/1panel/consts.go index 6ac677d80..d97b580d5 100644 --- a/pkg/core/deployer/providers/1panel/consts.go +++ b/pkg/core/deployer/providers/1panel/consts.go @@ -1,10 +1,10 @@ package onepanel const ( - // 资源类型：替换指定网站的证书。 - RESOURCE_TYPE_WEBSITE = "website" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定网站的证书。 + DEPLOY_TARGET_WEBSITE = "website" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) const ( diff --git a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go index e14f106d0..8b03495a8 100644 --- a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go +++ b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go @@ -32,16 +32,16 @@ type DeployerConfig struct { ResourceGroupId string `json:"resourceGroupId,omitempty"` // 阿里云地域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` // SNI 域名（支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时选填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时选填。 Domain string `json:"domain,omitempty"` } @@ -114,20 +114,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.ExtendedData["CertIdentifier"].(string), certX509.DNSNames); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.ExtendedData["CertIdentifier"].(string), certX509.DNSNames); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go index 6f14e647b..ae96a98cc 100644 --- a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go +++ b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go @@ -51,7 +51,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, LoadbalancerId: fLoadbalancerId, Domain: fDomain, }) @@ -68,7 +68,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, Domain: fDomain, }) diff --git a/pkg/core/deployer/providers/aliyun-alb/consts.go b/pkg/core/deployer/providers/aliyun-alb/consts.go index 33232ccf0..3353cc2ab 100644 --- a/pkg/core/deployer/providers/aliyun-alb/consts.go +++ b/pkg/core/deployer/providers/aliyun-alb/consts.go @@ -1,8 +1,8 @@ package aliyunalb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go index 11224389f..d39a8b53a 100644 --- a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go +++ b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go @@ -25,16 +25,16 @@ type DeployerConfig struct { ResourceGroupId string `json:"resourceGroupId,omitempty"` // 阿里云地域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听端口。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerPort int32 `json:"listenerPort,omitempty"` // SNI 域名（支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时选填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时选填。 Domain string `json:"domain,omitempty"` } @@ -94,20 +94,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb_test.go b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb_test.go index c338ffffe..341c9069b 100644 --- a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb_test.go +++ b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb_test.go @@ -51,7 +51,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, LoadbalancerId: fLoadbalancerId, Domain: fDomain, }) @@ -68,7 +68,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, LoadbalancerId: fLoadbalancerId, ListenerPort: int32(fListenerPort), Domain: fDomain, diff --git a/pkg/core/deployer/providers/aliyun-clb/consts.go b/pkg/core/deployer/providers/aliyun-clb/consts.go index cd8aa861d..8a9c6221a 100644 --- a/pkg/core/deployer/providers/aliyun-clb/consts.go +++ b/pkg/core/deployer/providers/aliyun-clb/consts.go @@ -1,8 +1,8 @@ package aliyunclb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go index e808e4f37..f6c1acab4 100644 --- a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go +++ b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go @@ -25,15 +25,15 @@ type DeployerConfig struct { AccessKeySecret string `json:"accessKeySecret"` // 阿里云资源组 ID。 ResourceGroupId string `json:"resourceGroupId,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 全球加速实例 ID。 AcceleratorId string `json:"acceleratorId"` // 全球加速监听 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` // SNI 域名（不支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_ACCELERATOR]、[RESOURCE_TYPE_LISTENER] 时选填。 + // 部署目标为 [DEPLOY_TARGET_ACCELERATOR]、[DEPLOY_TARGET_LISTENER] 时选填。 Domain string `json:"domain,omitempty"` } @@ -93,20 +93,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_ACCELERATOR: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_ACCELERATOR: if err := d.deployToAccelerator(ctx, upres.ExtendedData["CertIdentifier"].(string)); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.ExtendedData["CertIdentifier"].(string)); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga_test.go b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga_test.go index f5d259158..0e739c7b2 100644 --- a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga_test.go +++ b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga_test.go @@ -47,7 +47,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, - ResourceType: impl.RESOURCE_TYPE_ACCELERATOR, + DeployTarget: impl.DEPLOY_TARGET_ACCELERATOR, AcceleratorId: fAcceleratorId, Domain: fDomain, }) @@ -63,7 +63,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, Domain: fDomain, }) diff --git a/pkg/core/deployer/providers/aliyun-ga/consts.go b/pkg/core/deployer/providers/aliyun-ga/consts.go index 568599fe1..f4809418f 100644 --- a/pkg/core/deployer/providers/aliyun-ga/consts.go +++ b/pkg/core/deployer/providers/aliyun-ga/consts.go @@ -1,8 +1,8 @@ package aliyunga const ( - // 资源类型：部署到指定全球加速器。 - RESOURCE_TYPE_ACCELERATOR = "accelerator" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定全球加速器。 + DEPLOY_TARGET_ACCELERATOR = "accelerator" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go index edfac96a9..3ed2ca608 100644 --- a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go +++ b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go @@ -27,13 +27,13 @@ type DeployerConfig struct { ResourceGroupId string `json:"resourceGroupId,omitempty"` // 阿里云地域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` } @@ -95,20 +95,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.ExtendedData["CertIdentifier"].(string)); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.ExtendedData["CertIdentifier"].(string)); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb_test.go b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb_test.go index 2ca149f54..7428d3905 100644 --- a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb_test.go +++ b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb_test.go @@ -48,7 +48,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, LoadbalancerId: fLoadbalancerId, }) if err != nil { @@ -64,7 +64,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, }) if err != nil { diff --git a/pkg/core/deployer/providers/aliyun-nlb/consts.go b/pkg/core/deployer/providers/aliyun-nlb/consts.go index d8e132392..8dbdb39bd 100644 --- a/pkg/core/deployer/providers/aliyun-nlb/consts.go +++ b/pkg/core/deployer/providers/aliyun-nlb/consts.go @@ -1,8 +1,8 @@ package aliyunnlb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/apisix/apisix.go b/pkg/core/deployer/providers/apisix/apisix.go index 1b753d4ea..06913a4dd 100644 --- a/pkg/core/deployer/providers/apisix/apisix.go +++ b/pkg/core/deployer/providers/apisix/apisix.go @@ -20,10 +20,10 @@ type DeployerConfig struct { ApiKey string `json:"apiKey"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -61,15 +61,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/apisix/apisix_test.go b/pkg/core/deployer/providers/apisix/apisix_test.go index 248c3eef5..caedae08b 100644 --- a/pkg/core/deployer/providers/apisix/apisix_test.go +++ b/pkg/core/deployer/providers/apisix/apisix_test.go @@ -38,12 +38,11 @@ func TestProvider(t *testing.T) { fp.Parse() t.Run("Deploy", func(t *testing.T) { - provider, err := impl.NewDeployer(&impl.DeployerConfig{ ServerUrl: fServerUrl, ApiKey: fApiKey, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/apisix/consts.go b/pkg/core/deployer/providers/apisix/consts.go index c781a930c..f5deeff8b 100644 --- a/pkg/core/deployer/providers/apisix/consts.go +++ b/pkg/core/deployer/providers/apisix/consts.go @@ -1,6 +1,6 @@ package apisix const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go index f5328d172..fb4ce514f 100644 --- a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go +++ b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go @@ -24,16 +24,16 @@ type DeployerConfig struct { SecretAccessKey string `json:"secretAccessKey"` // 百度智能云区域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听端口。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerPort int32 `json:"listenerPort,omitempty"` // SNI 域名（支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时选填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时选填。 Domain string `json:"domain,omitempty"` } @@ -89,20 +89,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go index fe029b55a..b860b25dd 100644 --- a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go +++ b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go @@ -47,7 +47,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, Region: fRegion, LoadbalancerId: fLoadbalancerId, Domain: fDomain, diff --git a/pkg/core/deployer/providers/baiducloud-appblb/consts.go b/pkg/core/deployer/providers/baiducloud-appblb/consts.go index c8d8dcacd..8ef9c3e8f 100644 --- a/pkg/core/deployer/providers/baiducloud-appblb/consts.go +++ b/pkg/core/deployer/providers/baiducloud-appblb/consts.go @@ -1,8 +1,8 @@ package baiducloudappblb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go index fdf66e219..ac9cbcce5 100644 --- a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go +++ b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go @@ -24,16 +24,16 @@ type DeployerConfig struct { SecretAccessKey string `json:"secretAccessKey"` // 百度智能云区域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听端口。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerPort int32 `json:"listenerPort,omitempty"` // SNI 域名（支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时选填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时选填。 Domain string `json:"domain,omitempty"` } @@ -89,20 +89,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb_test.go b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb_test.go index 97cff077b..779cc07be 100644 --- a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb_test.go +++ b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb_test.go @@ -47,7 +47,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, Region: fRegion, LoadbalancerId: fLoadbalancerId, Domain: fDomain, diff --git a/pkg/core/deployer/providers/baiducloud-blb/consts.go b/pkg/core/deployer/providers/baiducloud-blb/consts.go index 7f2c21fc9..456c650b5 100644 --- a/pkg/core/deployer/providers/baiducloud-blb/consts.go +++ b/pkg/core/deployer/providers/baiducloud-blb/consts.go @@ -1,8 +1,8 @@ package baiducloudblb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go index 46f5dd366..a2cabac13 100644 --- a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go +++ b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go @@ -17,15 +17,15 @@ import ( type DeployerConfig struct { // 白山云 API Token。 ApiToken string `json:"apiToken"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 域名匹配模式。暂时只支持精确匹配。 // 零值时默认值 [DOMAIN_MATCH_PATTERN_EXACT]。 DomainMatchPattern string `json:"domainMatchPattern,omitempty"` // 加速域名（支持泛域名）。 Domain string `json:"domain"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -72,20 +72,20 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_DOMAIN: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_DOMAIN: if err := d.deployToDomain(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/baishan-cdn/consts.go b/pkg/core/deployer/providers/baishan-cdn/consts.go index 88bc21af7..cc8e53aff 100644 --- a/pkg/core/deployer/providers/baishan-cdn/consts.go +++ b/pkg/core/deployer/providers/baishan-cdn/consts.go @@ -1,10 +1,10 @@ package baishancdn const ( - // 资源类型：替换指定域名的证书。 - RESOURCE_TYPE_DOMAIN = "domain" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定域名的证书。 + DEPLOY_TARGET_DOMAIN = "domain" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) const ( diff --git a/pkg/core/deployer/providers/cdnfly/cdnfly.go b/pkg/core/deployer/providers/cdnfly/cdnfly.go index ab5e0b4c7..021e9b85b 100644 --- a/pkg/core/deployer/providers/cdnfly/cdnfly.go +++ b/pkg/core/deployer/providers/cdnfly/cdnfly.go @@ -23,13 +23,13 @@ type DeployerConfig struct { ApiSecret string `json:"apiSecret"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 网站 ID。 - // 部署资源类型为 [RESOURCE_TYPE_WEBSITE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_WEBSITE] 时必填。 SiteId string `json:"siteId,omitempty"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -67,20 +67,20 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_WEBSITE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_WEBSITE: if err := d.deployToSite(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/cdnfly/cdnfly_test.go b/pkg/core/deployer/providers/cdnfly/cdnfly_test.go index 96f7d3247..4a47ef6bd 100644 --- a/pkg/core/deployer/providers/cdnfly/cdnfly_test.go +++ b/pkg/core/deployer/providers/cdnfly/cdnfly_test.go @@ -46,7 +46,7 @@ func TestProvider(t *testing.T) { ApiKey: fApiKey, ApiSecret: fApiSecret, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/cdnfly/consts.go b/pkg/core/deployer/providers/cdnfly/consts.go index 6f309f174..41cfb3994 100644 --- a/pkg/core/deployer/providers/cdnfly/consts.go +++ b/pkg/core/deployer/providers/cdnfly/consts.go @@ -1,8 +1,8 @@ package cdnfly const ( - // 资源类型：替换指定网站的证书。 - RESOURCE_TYPE_WEBSITE = "website" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定网站的证书。 + DEPLOY_TARGET_WEBSITE = "website" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/cpanel/consts.go b/pkg/core/deployer/providers/cpanel/consts.go index 506091ca2..7ef495a8e 100644 --- a/pkg/core/deployer/providers/cpanel/consts.go +++ b/pkg/core/deployer/providers/cpanel/consts.go @@ -1,6 +1,6 @@ package cpanel const ( - // 资源类型：替换指定网站的证书。 - RESOURCE_TYPE_WEBSITE = "website" + // 部署目标：替换指定网站的证书。 + DEPLOY_TARGET_WEBSITE = "website" ) diff --git a/pkg/core/deployer/providers/cpanel/cpanel.go b/pkg/core/deployer/providers/cpanel/cpanel.go index a1892d124..e86b226dc 100644 --- a/pkg/core/deployer/providers/cpanel/cpanel.go +++ b/pkg/core/deployer/providers/cpanel/cpanel.go @@ -22,10 +22,10 @@ type DeployerConfig struct { ApiToken string `json:"apiToken"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 网站域名（不支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_WEBSITE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_WEBSITE] 时必填。 Domain string `json:"domain,omitempty"` } @@ -63,15 +63,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_WEBSITE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_WEBSITE: if err := d.deployToWebsite(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/cpanel/cpanel_test.go b/pkg/core/deployer/providers/cpanel/cpanel_test.go index 3efe6b9fb..44440fcfe 100644 --- a/pkg/core/deployer/providers/cpanel/cpanel_test.go +++ b/pkg/core/deployer/providers/cpanel/cpanel_test.go @@ -46,7 +46,7 @@ func TestProvider(t *testing.T) { Username: fUsername, ApiToken: fApiToken, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_WEBSITE, + DeployTarget: impl.DEPLOY_TARGET_WEBSITE, Domain: fDomain, }) if err != nil { diff --git a/pkg/core/deployer/providers/ctcccloud-elb/consts.go b/pkg/core/deployer/providers/ctcccloud-elb/consts.go index e5ad97403..ac0801cb0 100644 --- a/pkg/core/deployer/providers/ctcccloud-elb/consts.go +++ b/pkg/core/deployer/providers/ctcccloud-elb/consts.go @@ -1,8 +1,8 @@ package ctcccloudelb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go index f830bd34d..0625cad49 100644 --- a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go +++ b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go @@ -22,13 +22,13 @@ type DeployerConfig struct { SecretAccessKey string `json:"secretAccessKey"` // 天翼云资源池 ID。 RegionId string `json:"regionId"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` } @@ -85,20 +85,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb_test.go b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb_test.go index b036e6270..7b237db1a 100644 --- a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb_test.go +++ b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb_test.go @@ -48,7 +48,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, RegionId: fRegionId, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, LoadbalancerId: fLoadbalancerId, }) if err != nil { @@ -64,7 +64,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, RegionId: fRegionId, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, }) if err != nil { diff --git a/pkg/core/deployer/providers/flexcdn/consts.go b/pkg/core/deployer/providers/flexcdn/consts.go index 9261211bb..bdbbb1961 100644 --- a/pkg/core/deployer/providers/flexcdn/consts.go +++ b/pkg/core/deployer/providers/flexcdn/consts.go @@ -1,6 +1,6 @@ package flexcdn const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/flexcdn/flexcdn.go b/pkg/core/deployer/providers/flexcdn/flexcdn.go index b028f13c0..b1003fa78 100644 --- a/pkg/core/deployer/providers/flexcdn/flexcdn.go +++ b/pkg/core/deployer/providers/flexcdn/flexcdn.go @@ -25,10 +25,10 @@ type DeployerConfig struct { AccessKey string `json:"accessKey"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId int64 `json:"certificateId,omitempty"` } @@ -66,15 +66,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/flexcdn/flexcdn_test.go b/pkg/core/deployer/providers/flexcdn/flexcdn_test.go index 4538e9218..8558a55e0 100644 --- a/pkg/core/deployer/providers/flexcdn/flexcdn_test.go +++ b/pkg/core/deployer/providers/flexcdn/flexcdn_test.go @@ -47,7 +47,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKey: fAccessKey, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/goedge/consts.go b/pkg/core/deployer/providers/goedge/consts.go index fe615d6ce..719864f61 100644 --- a/pkg/core/deployer/providers/goedge/consts.go +++ b/pkg/core/deployer/providers/goedge/consts.go @@ -1,6 +1,6 @@ package goedge const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/goedge/goedge.go b/pkg/core/deployer/providers/goedge/goedge.go index 7513fdad4..bb1321a95 100644 --- a/pkg/core/deployer/providers/goedge/goedge.go +++ b/pkg/core/deployer/providers/goedge/goedge.go @@ -25,10 +25,10 @@ type DeployerConfig struct { AccessKey string `json:"accessKey"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId int64 `json:"certificateId,omitempty"` } @@ -66,15 +66,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/goedge/goedge_test.go b/pkg/core/deployer/providers/goedge/goedge_test.go index f74b023f7..59c8fe1f5 100644 --- a/pkg/core/deployer/providers/goedge/goedge_test.go +++ b/pkg/core/deployer/providers/goedge/goedge_test.go @@ -47,7 +47,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKey: fAccessKey, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/huaweicloud-apig/consts.go b/pkg/core/deployer/providers/huaweicloud-apig/consts.go index 8a76a3a88..d43e73ab2 100644 --- a/pkg/core/deployer/providers/huaweicloud-apig/consts.go +++ b/pkg/core/deployer/providers/huaweicloud-apig/consts.go @@ -1,6 +1,6 @@ package huaweicloudapig const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go index 1fece77c3..97217ac72 100644 --- a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go +++ b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go @@ -28,10 +28,10 @@ type DeployerConfig struct { EnterpriseProjectId string `json:"enterpriseProjectId,omitempty"` // 华为云区域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -73,15 +73,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig_test.go b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig_test.go index 116652a52..a0ef73f65 100644 --- a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig_test.go +++ b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig_test.go @@ -45,7 +45,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/huaweicloud-elb/consts.go b/pkg/core/deployer/providers/huaweicloud-elb/consts.go index a4d20efe7..cdc417550 100644 --- a/pkg/core/deployer/providers/huaweicloud-elb/consts.go +++ b/pkg/core/deployer/providers/huaweicloud-elb/consts.go @@ -1,10 +1,10 @@ package huaweicloudelb const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go index 20d660ef0..20f212653 100644 --- a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go @@ -31,16 +31,16 @@ type DeployerConfig struct { EnterpriseProjectId string `json:"enterpriseProjectId,omitempty"` // 华为云区域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` // 负载均衡器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` } @@ -92,25 +92,25 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_LOADBALANCER: + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb_test.go b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb_test.go index 10c539397..db781c369 100644 --- a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb_test.go +++ b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb_test.go @@ -51,7 +51,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, LoadbalancerId: fLoadbalancerId, }) if err != nil { @@ -67,7 +67,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, }) if err != nil { @@ -83,7 +83,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/huaweicloud-waf/consts.go b/pkg/core/deployer/providers/huaweicloud-waf/consts.go index e52a4a6ce..50f84c2f9 100644 --- a/pkg/core/deployer/providers/huaweicloud-waf/consts.go +++ b/pkg/core/deployer/providers/huaweicloud-waf/consts.go @@ -1,10 +1,10 @@ package huaweicloudwaf const ( - // 资源类型：部署到云模式防护网站。 - RESOURCE_TYPE_CLOUDSERVER = "cloudserver" - // 资源类型：部署到独享模式防护网站。 - RESOURCE_TYPE_PREMIUMHOST = "premiumhost" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：部署到云模式防护网站。 + DEPLOY_TARGET_CLOUDSERVER = "cloudserver" + // 部署目标：部署到独享模式防护网站。 + DEPLOY_TARGET_PREMIUMHOST = "premiumhost" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go index efaf2492f..bd5a04a4e 100644 --- a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go @@ -30,14 +30,14 @@ type DeployerConfig struct { EnterpriseProjectId string `json:"enterpriseProjectId,omitempty"` // 华为云区域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` - // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 - CertificateId string `json:"certificateId,omitempty"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 防护域名（支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_CLOUDSERVER]、[RESOURCE_TYPE_PREMIUMHOST] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CLOUDSERVER]、[DEPLOY_TARGET_PREMIUMHOST] 时必填。 Domain string `json:"domain,omitempty"` + // 证书 ID。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 + CertificateId string `json:"certificateId,omitempty"` } type Deployer struct { @@ -96,25 +96,25 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CLOUDSERVER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CLOUDSERVER: if err := d.deployToCloudServer(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_PREMIUMHOST: + case DEPLOY_TARGET_PREMIUMHOST: if err := d.deployToPremiumHost(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf_test.go b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf_test.go index 4a4912cd4..09b1b65dd 100644 --- a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf_test.go +++ b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf_test.go @@ -14,7 +14,6 @@ var ( fAccessKeyId string fSecretAccessKey string fRegion string - fResourceType string fDomain string ) @@ -24,7 +23,6 @@ func init() { fp.DefineString(&fAccessKeyId, "ACCESSKEYID") fp.DefineString(&fSecretAccessKey, "SECRETACCESSKEY") fp.DefineString(&fRegion, "REGION") - fp.DefineString(&fResourceType, "RESOURCETYPE") fp.DefineString(&fDomain, "DOMAIN") } @@ -37,18 +35,17 @@ Shell command to run this test: --HUAWEICLOUDWAF_ACCESSKEYID="your-access-key-id" \ --HUAWEICLOUDWAF_SECRETACCESSKEY="your-secret-access-key" \ --HUAWEICLOUDWAF_REGION="cn-north-1" \ - --HUAWEICLOUDWAF_RESOURCETYPE="premium" \ --HUAWEICLOUDWAF_DOMAIN="example.com" */ func TestProvider(t *testing.T) { fp.Parse() - t.Run("Deploy", func(t *testing.T) { + t.Run("Deploy_ToPremium", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, Region: fRegion, - ResourceType: fResourceType, + DeployTarget: impl.DEPLOY_TARGET_PREMIUMHOST, Domain: fDomain, }) if err != nil { diff --git a/pkg/core/deployer/providers/jdcloud-alb/consts.go b/pkg/core/deployer/providers/jdcloud-alb/consts.go index 0e2a78e0c..cf549a5e3 100644 --- a/pkg/core/deployer/providers/jdcloud-alb/consts.go +++ b/pkg/core/deployer/providers/jdcloud-alb/consts.go @@ -1,8 +1,8 @@ package jdcloudalb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go index b2a29f4a1..c90ae2477 100644 --- a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go +++ b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go @@ -26,16 +26,16 @@ type DeployerConfig struct { AccessKeySecret string `json:"accessKeySecret"` // 京东云地域 ID。 RegionId string `json:"regionId"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 监听器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` // SNI 域名（支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时选填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时选填。 Domain string `json:"domain,omitempty"` } @@ -93,20 +93,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb_test.go b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb_test.go index c46ce9b40..15625a0e7 100644 --- a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb_test.go +++ b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb_test.go @@ -48,7 +48,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, RegionId: fRegionId, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, LoadbalancerId: fLoadbalancerId, }) if err != nil { @@ -64,7 +64,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, RegionId: fRegionId, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, }) if err != nil { diff --git a/pkg/core/deployer/providers/kong/consts.go b/pkg/core/deployer/providers/kong/consts.go index cbc34ee8b..7522841d3 100644 --- a/pkg/core/deployer/providers/kong/consts.go +++ b/pkg/core/deployer/providers/kong/consts.go @@ -1,6 +1,6 @@ package kong const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/kong/kong.go b/pkg/core/deployer/providers/kong/kong.go index e9d409c9e..89a1f0258 100644 --- a/pkg/core/deployer/providers/kong/kong.go +++ b/pkg/core/deployer/providers/kong/kong.go @@ -21,13 +21,13 @@ type DeployerConfig struct { ApiToken string `json:"apiToken,omitempty"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 工作空间。 // 选填。 Workspace string `json:"workspace,omitempty"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -65,15 +65,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/kong/kong_test.go b/pkg/core/deployer/providers/kong/kong_test.go index e1bcd22ae..1ec0474c8 100644 --- a/pkg/core/deployer/providers/kong/kong_test.go +++ b/pkg/core/deployer/providers/kong/kong_test.go @@ -42,7 +42,7 @@ func TestProvider(t *testing.T) { ServerUrl: fServerUrl, ApiToken: fApiToken, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/ksyun-cdn/consts.go b/pkg/core/deployer/providers/ksyun-cdn/consts.go index e4f7b9122..9e2dec62f 100644 --- a/pkg/core/deployer/providers/ksyun-cdn/consts.go +++ b/pkg/core/deployer/providers/ksyun-cdn/consts.go @@ -1,10 +1,10 @@ package ksyuncdn const ( - // 资源类型：替换指定域名的证书。 - RESOURCE_TYPE_DOMAIN = "domain" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定域名的证书。 + DEPLOY_TARGET_DOMAIN = "domain" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) const ( diff --git a/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn.go b/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn.go index c8f39e75c..712ff99d7 100644 --- a/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn.go +++ b/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn.go @@ -22,15 +22,15 @@ type DeployerConfig struct { AccessKeyId string `json:"accessKeyId"` // 金山云 SecretAccessKey。 SecretAccessKey string `json:"secretAccessKey"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 域名匹配模式。 // 零值时默认值 [DOMAIN_MATCH_PATTERN_EXACT]。 DomainMatchPattern string `json:"domainMatchPattern,omitempty"` // 加速域名（支持泛域名）。 Domain string `json:"domain"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -68,20 +68,20 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_DOMAIN: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_DOMAIN: if err := d.deployToDomain(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn_test.go b/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn_test.go index 3c36ba7e0..c0c6904d2 100644 --- a/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn_test.go +++ b/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn_test.go @@ -44,7 +44,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, - ResourceType: impl.RESOURCE_TYPE_DOMAIN, + DeployTarget: impl.DEPLOY_TARGET_DOMAIN, DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT, Domain: fDomain, }) @@ -60,7 +60,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/ksyun-slb/consts.go b/pkg/core/deployer/providers/ksyun-slb/consts.go index ba7d7d8de..18247c7e6 100644 --- a/pkg/core/deployer/providers/ksyun-slb/consts.go +++ b/pkg/core/deployer/providers/ksyun-slb/consts.go @@ -1,6 +1,6 @@ package ksyunslb const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/ksyun-slb/ksyun_slb.go b/pkg/core/deployer/providers/ksyun-slb/ksyun_slb.go index 32657f2d8..d45c9cb02 100644 --- a/pkg/core/deployer/providers/ksyun-slb/ksyun_slb.go +++ b/pkg/core/deployer/providers/ksyun-slb/ksyun_slb.go @@ -17,10 +17,10 @@ type DeployerConfig struct { AccessKeyId string `json:"accessKeyId"` // 金山云 SecretAccessKey。 SecretAccessKey string `json:"secretAccessKey"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -58,15 +58,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/ksyun-slb/ksyun_slb_test.go b/pkg/core/deployer/providers/ksyun-slb/ksyun_slb_test.go index 4dd7e8b7e..982ff9294 100644 --- a/pkg/core/deployer/providers/ksyun-slb/ksyun_slb_test.go +++ b/pkg/core/deployer/providers/ksyun-slb/ksyun_slb_test.go @@ -38,11 +38,10 @@ func TestProvider(t *testing.T) { fp.Parse() t.Run("Deploy_ToCertificate", func(t *testing.T) { - provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, SecretAccessKey: fSecretAccessKey, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/lecdn/consts.go b/pkg/core/deployer/providers/lecdn/consts.go index f2aad824c..0f0359bc1 100644 --- a/pkg/core/deployer/providers/lecdn/consts.go +++ b/pkg/core/deployer/providers/lecdn/consts.go @@ -1,6 +1,6 @@ package lecdn const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/lecdn/lecdn.go b/pkg/core/deployer/providers/lecdn/lecdn.go index b9088e7c0..ad2652f85 100644 --- a/pkg/core/deployer/providers/lecdn/lecdn.go +++ b/pkg/core/deployer/providers/lecdn/lecdn.go @@ -27,13 +27,13 @@ type DeployerConfig struct { Password string `json:"password"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId int64 `json:"certificateId,omitempty"` // 客户 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时选填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时选填。 ClientId int64 `json:"clientId,omitempty"` } @@ -71,15 +71,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/lecdn/lecdn_test.go b/pkg/core/deployer/providers/lecdn/lecdn_test.go index e08cdee2a..5af1aebf8 100644 --- a/pkg/core/deployer/providers/lecdn/lecdn_test.go +++ b/pkg/core/deployer/providers/lecdn/lecdn_test.go @@ -50,7 +50,7 @@ func TestProvider(t *testing.T) { Username: fUsername, Password: fPassword, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/netlify/consts.go b/pkg/core/deployer/providers/netlify/consts.go index cc8178cd2..2cc467a1d 100644 --- a/pkg/core/deployer/providers/netlify/consts.go +++ b/pkg/core/deployer/providers/netlify/consts.go @@ -1,6 +1,6 @@ package netlify const ( - // 资源类型：替换指定网站的证书。 - RESOURCE_TYPE_WEBSITE = "website" + // 部署目标：替换指定网站的证书。 + DEPLOY_TARGET_WEBSITE = "website" ) diff --git a/pkg/core/deployer/providers/netlify/netlify.go b/pkg/core/deployer/providers/netlify/netlify.go index d869d0fab..c3745599f 100644 --- a/pkg/core/deployer/providers/netlify/netlify.go +++ b/pkg/core/deployer/providers/netlify/netlify.go @@ -13,10 +13,10 @@ import ( type DeployerConfig struct { // netlify API Token。 ApiToken string `json:"apiToken"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // netlify 网站 ID。 - // 部署资源类型为 [RESOURCE_TYPE_WEBSITE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_WEBSITE] 时必填。 SiteId string `json:"siteId,omitempty"` } @@ -54,15 +54,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_WEBSITE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_WEBSITE: if err := d.deployToWebsite(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/netlify/netlify_test.go b/pkg/core/deployer/providers/netlify/netlify_test.go index ce5033a05..94fd3e30f 100644 --- a/pkg/core/deployer/providers/netlify/netlify_test.go +++ b/pkg/core/deployer/providers/netlify/netlify_test.go @@ -37,7 +37,7 @@ func TestProvider(t *testing.T) { t.Run("Deploy", func(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ ApiToken: fApiToken, - ResourceType: impl.RESOURCE_TYPE_WEBSITE, + DeployTarget: impl.DEPLOY_TARGET_WEBSITE, SiteId: fSiteId, }) if err != nil { diff --git a/pkg/core/deployer/providers/nginxproxymanager/consts.go b/pkg/core/deployer/providers/nginxproxymanager/consts.go index 36f5947cf..137959b5e 100644 --- a/pkg/core/deployer/providers/nginxproxymanager/consts.go +++ b/pkg/core/deployer/providers/nginxproxymanager/consts.go @@ -6,10 +6,10 @@ const ( ) const ( - // 资源类型：替换指定主机的证书。 - RESOURCE_TYPE_HOST = "host" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定主机的证书。 + DEPLOY_TARGET_HOST = "host" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) const ( diff --git a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go index f1269f972..2ded08c84 100644 --- a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go +++ b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go @@ -34,19 +34,19 @@ type DeployerConfig struct { ApiToken string `json:"apiToken,omitempty"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 域名匹配模式。 // 零值时默认值 [HOST_MATCH_PATTERN_SPECIFIED]。 HostMatchPattern string `json:"hostMatchPattern,omitempty"` // 主机类型。 - // 部署资源类型为 [RESOURCE_TYPE_HOST] 时必填。 + // 部署目标为 [DEPLOY_TARGET_HOST] 时必填。 HostType string `json:"hostType,omitempty"` // 主机 ID。 - // 部署资源类型为 [RESOURCE_TYPE_HOST]、且匹配模式非 [HOST_MATCH_PATTERN_CERTSAN] 时必填。 + // 部署目标为 [DEPLOY_TARGET_HOST]、且匹配模式非 [HOST_MATCH_PATTERN_CERTSAN] 时必填。 HostId int64 `json:"hostId,omitempty"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId int64 `json:"certificateId,omitempty"` } @@ -100,20 +100,20 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_HOST: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_HOST: if err := d.deployToHost(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager_test.go b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager_test.go index 612f98b32..18d19928e 100644 --- a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager_test.go +++ b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager_test.go @@ -49,7 +49,7 @@ func TestProvider(t *testing.T) { Username: fUsername, Password: fPassword, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_HOST, + DeployTarget: impl.DEPLOY_TARGET_HOST, HostType: fHostType, HostMatchPattern: impl.HOST_MATCH_PATTERN_SPECIFIED, HostId: fHostId, diff --git a/pkg/core/deployer/providers/ratpanel/consts.go b/pkg/core/deployer/providers/ratpanel/consts.go index 57b199153..2dfa24cab 100644 --- a/pkg/core/deployer/providers/ratpanel/consts.go +++ b/pkg/core/deployer/providers/ratpanel/consts.go @@ -1,8 +1,8 @@ package ratpanel const ( - // 资源类型：替换指定网站的证书。 - RESOURCE_TYPE_WEBSITE = "website" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定网站的证书。 + DEPLOY_TARGET_WEBSITE = "website" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/ratpanel/ratpanel.go b/pkg/core/deployer/providers/ratpanel/ratpanel.go index c0f87b2bc..29a1daafa 100644 --- a/pkg/core/deployer/providers/ratpanel/ratpanel.go +++ b/pkg/core/deployer/providers/ratpanel/ratpanel.go @@ -21,13 +21,13 @@ type DeployerConfig struct { AccessToken string `json:"accessToken"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 网站名称。 - // 部署资源类型为 [RESOURCE_TYPE_WEBSITE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_WEBSITE] 时必填。 SiteNames []string `json:"siteNames,omitempty"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId int64 `json:"certificateId,omitempty"` } @@ -65,20 +65,20 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_WEBSITE: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_WEBSITE: if err := d.deployToWebsite(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/ratpanel/ratpanel_test.go b/pkg/core/deployer/providers/ratpanel/ratpanel_test.go index 885de0189..ea39936b0 100644 --- a/pkg/core/deployer/providers/ratpanel/ratpanel_test.go +++ b/pkg/core/deployer/providers/ratpanel/ratpanel_test.go @@ -46,7 +46,7 @@ func TestProvider(t *testing.T) { AccessTokenId: fAccessTokenId, AccessToken: fAccessToken, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_WEBSITE, + DeployTarget: impl.DEPLOY_TARGET_WEBSITE, SiteNames: []string{fSiteName}, }) if err != nil { diff --git a/pkg/core/deployer/providers/safeline/consts.go b/pkg/core/deployer/providers/safeline/consts.go index 6fdf947f8..b58b9162b 100644 --- a/pkg/core/deployer/providers/safeline/consts.go +++ b/pkg/core/deployer/providers/safeline/consts.go @@ -1,6 +1,6 @@ package safeline const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/safeline/safeline.go b/pkg/core/deployer/providers/safeline/safeline.go index 624601d26..43d2137b5 100644 --- a/pkg/core/deployer/providers/safeline/safeline.go +++ b/pkg/core/deployer/providers/safeline/safeline.go @@ -17,10 +17,10 @@ type DeployerConfig struct { ApiToken string `json:"apiToken"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId int64 `json:"certificateId,omitempty"` } @@ -58,15 +58,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式`` - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程`` + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/safeline/safeline_test.go b/pkg/core/deployer/providers/safeline/safeline_test.go index a1d51c666..0a55d9516 100644 --- a/pkg/core/deployer/providers/safeline/safeline_test.go +++ b/pkg/core/deployer/providers/safeline/safeline_test.go @@ -42,7 +42,7 @@ func TestProvider(t *testing.T) { ServerUrl: fServerUrl, ApiToken: fApiToken, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/samwaf/consts.go b/pkg/core/deployer/providers/samwaf/consts.go index c05a71f0f..fb4ac330c 100644 --- a/pkg/core/deployer/providers/samwaf/consts.go +++ b/pkg/core/deployer/providers/samwaf/consts.go @@ -1,6 +1,6 @@ package samwaf const ( - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/samwaf/samwaf.go b/pkg/core/deployer/providers/samwaf/samwaf.go index e38cd5150..b31691f76 100644 --- a/pkg/core/deployer/providers/samwaf/samwaf.go +++ b/pkg/core/deployer/providers/samwaf/samwaf.go @@ -17,10 +17,10 @@ type DeployerConfig struct { ApiKey string `json:"apiKey"` // 是否允许不安全的连接。 AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -58,15 +58,15 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式`` - switch d.config.ResourceType { - case RESOURCE_TYPE_CERTIFICATE: + // 根据部署目标决定业务流程`` + switch d.config.DeployTarget { + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/samwaf/samwaf_test.go b/pkg/core/deployer/providers/samwaf/samwaf_test.go index 6dd5cc7f4..571cccf8d 100644 --- a/pkg/core/deployer/providers/samwaf/samwaf_test.go +++ b/pkg/core/deployer/providers/samwaf/samwaf_test.go @@ -42,7 +42,7 @@ func TestProvider(t *testing.T) { ServerUrl: fServerUrl, ApiKey: fApiKey, AllowInsecureConnections: true, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/tencentcloud-clb/consts.go b/pkg/core/deployer/providers/tencentcloud-clb/consts.go index 78020e2ca..56f0bf2aa 100644 --- a/pkg/core/deployer/providers/tencentcloud-clb/consts.go +++ b/pkg/core/deployer/providers/tencentcloud-clb/consts.go @@ -1,10 +1,10 @@ package tencentcloudclb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" - // 资源类型：部署到指定转发规则域名。 - RESOURCE_TYPE_RULEDOMAIN = "ruledomain" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" + // 部署目标：部署到指定转发规则域名。 + DEPLOY_TARGET_RULEDOMAIN = "ruledomain" ) diff --git a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go index 08309d98e..1adbcbc17 100644 --- a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go +++ b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go @@ -28,16 +28,16 @@ type DeployerConfig struct { Endpoint string `json:"endpoint,omitempty"` // 腾讯云地域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_SSLDEPLOY]、[RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_RULEDOMAIN] 时必填。 + // 部署目标为 [DEPLOY_TARGET_SSLDEPLOY]、[DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_RULEDOMAIN] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听 ID。 - // 部署资源类型为 [RESOURCE_TYPE_SSLDEPLOY]、[RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER]、[RESOURCE_TYPE_RULEDOMAIN] 时必填。 + // 部署目标为 [DEPLOY_TARGET_SSLDEPLOY]、[DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER]、[DEPLOY_TARGET_RULEDOMAIN] 时必填。 ListenerId string `json:"listenerId,omitempty"` // SNI 域名或七层转发规则域名（支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_SSLDEPLOY] 时选填；部署资源类型为 [RESOURCE_TYPE_RULEDOMAIN] 时必填。 + // 部署目标为 [DEPLOY_TARGET_SSLDEPLOY] 时选填；部署目标为 [DEPLOY_TARGET_RULEDOMAIN] 时必填。 Domain string `json:"domain,omitempty"` } @@ -98,25 +98,25 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_RULEDOMAIN: + case DEPLOY_TARGET_RULEDOMAIN: if err := d.deployToRuleDomain(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb_test.go b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb_test.go index 3140d45a1..d8ddf1618 100644 --- a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb_test.go +++ b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb_test.go @@ -51,7 +51,7 @@ func TestProvider(t *testing.T) { SecretId: fSecretId, SecretKey: fSecretKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LOADBALANCER, + DeployTarget: impl.DEPLOY_TARGET_LOADBALANCER, LoadbalancerId: fLoadbalancerId, }) if err != nil { @@ -67,7 +67,7 @@ func TestProvider(t *testing.T) { SecretId: fSecretId, SecretKey: fSecretKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, LoadbalancerId: fLoadbalancerId, ListenerId: fListenerId, }) @@ -84,7 +84,7 @@ func TestProvider(t *testing.T) { SecretId: fSecretId, SecretKey: fSecretKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_RULEDOMAIN, + DeployTarget: impl.DEPLOY_TARGET_RULEDOMAIN, LoadbalancerId: fLoadbalancerId, ListenerId: fListenerId, Domain: fDomain, diff --git a/pkg/core/deployer/providers/tencentcloud-gaap/consts.go b/pkg/core/deployer/providers/tencentcloud-gaap/consts.go index 3f45716c6..60d1be1b3 100644 --- a/pkg/core/deployer/providers/tencentcloud-gaap/consts.go +++ b/pkg/core/deployer/providers/tencentcloud-gaap/consts.go @@ -1,6 +1,6 @@ package tencentcloudgaap const ( - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go index a3c4f2294..48f1dbc36 100644 --- a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go +++ b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go @@ -23,13 +23,13 @@ type DeployerConfig struct { SecretKey string `json:"secretKey"` // 腾讯云接口端点。 Endpoint string `json:"endpoint,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 通道 ID。 // 选填。 ProxyId string `json:"proxyId,omitempty"` // 负载均衡监听 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` } @@ -90,15 +90,15 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LISTENER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap_test.go b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap_test.go index 6b5f78900..7914dba01 100644 --- a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap_test.go +++ b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap_test.go @@ -44,7 +44,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ SecretId: fSecretId, SecretKey: fSecretKey, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ProxyId: fProxyId, ListenerId: fListenerId, }) diff --git a/pkg/core/deployer/providers/ucloud-ualb/consts.go b/pkg/core/deployer/providers/ucloud-ualb/consts.go index d858a8663..31683c3b0 100644 --- a/pkg/core/deployer/providers/ucloud-ualb/consts.go +++ b/pkg/core/deployer/providers/ucloud-ualb/consts.go @@ -1,8 +1,8 @@ package ucloudualb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go index a169e680c..0d893a5f8 100644 --- a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go +++ b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go @@ -27,16 +27,16 @@ type DeployerConfig struct { ProjectId string `json:"projectId,omitempty"` // 优刻得地域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` // SNI 域名（不支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时选填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时选填。 Domain string `json:"domain,omitempty"` } @@ -96,20 +96,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb_test.go b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb_test.go index 45ba26318..aefd3a56c 100644 --- a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb_test.go +++ b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb_test.go @@ -48,7 +48,7 @@ func TestProvider(t *testing.T) { PrivateKey: fPrivateKey, PublicKey: fPublicKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, LoadbalancerId: fLoadbalancerId, ListenerId: fListenerId, }) diff --git a/pkg/core/deployer/providers/ucloud-uclb/consts.go b/pkg/core/deployer/providers/ucloud-uclb/consts.go index 5ef9873d7..31e191c03 100644 --- a/pkg/core/deployer/providers/ucloud-uclb/consts.go +++ b/pkg/core/deployer/providers/ucloud-uclb/consts.go @@ -1,8 +1,8 @@ package uclouduclb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定 VServer。 - RESOURCE_TYPE_VSERVER = "vserver" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定 VServer。 + DEPLOY_TARGET_VSERVER = "vserver" ) diff --git a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go index f4d14832b..22e87f308 100644 --- a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go +++ b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go @@ -27,13 +27,13 @@ type DeployerConfig struct { ProjectId string `json:"projectId,omitempty"` // 优刻得地域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_VSERVER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_VSERVER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡 VServer ID。 - // 部署资源类型为 [RESOURCE_TYPE_VSERVER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_VSERVER] 时必填。 VServerId string `json:"vserverId,omitempty"` } @@ -103,20 +103,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.sslId2PemMapMu.Unlock() } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_VSERVER: + case DEPLOY_TARGET_VSERVER: if err := d.deployToVServer(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb_test.go b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb_test.go index fc150d666..4521f334f 100644 --- a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb_test.go +++ b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb_test.go @@ -48,7 +48,7 @@ func TestProvider(t *testing.T) { PrivateKey: fPrivateKey, PublicKey: fPublicKey, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_VSERVER, + DeployTarget: impl.DEPLOY_TARGET_VSERVER, LoadbalancerId: fLoadbalancerId, VServerId: fVServerId, }) diff --git a/pkg/core/deployer/providers/volcengine-alb/consts.go b/pkg/core/deployer/providers/volcengine-alb/consts.go index 8a96cd705..e5846473f 100644 --- a/pkg/core/deployer/providers/volcengine-alb/consts.go +++ b/pkg/core/deployer/providers/volcengine-alb/consts.go @@ -1,8 +1,8 @@ package volcenginealb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go index ae68f82a4..099fe9719 100644 --- a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go +++ b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go @@ -23,16 +23,16 @@ type DeployerConfig struct { AccessKeySecret string `json:"accessKeySecret"` // 火山引擎地域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` // SNI 域名（支持泛域名）。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时选填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER]、[DEPLOY_TARGET_LISTENER] 时选填。 Domain string `json:"domain,omitempty"` } @@ -91,20 +91,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go index 4e3a4f64b..08924a166 100644 --- a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go +++ b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb_test.go @@ -45,7 +45,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, }) if err != nil { diff --git a/pkg/core/deployer/providers/volcengine-clb/consts.go b/pkg/core/deployer/providers/volcengine-clb/consts.go index a59a3aa5b..d70353000 100644 --- a/pkg/core/deployer/providers/volcengine-clb/consts.go +++ b/pkg/core/deployer/providers/volcengine-clb/consts.go @@ -1,8 +1,8 @@ package volcengineclb const ( - // 资源类型：部署到指定负载均衡器。 - RESOURCE_TYPE_LOADBALANCER = "loadbalancer" - // 资源类型：部署到指定监听器。 - RESOURCE_TYPE_LISTENER = "listener" + // 部署目标：部署到指定负载均衡器。 + DEPLOY_TARGET_LOADBALANCER = "loadbalancer" + // 部署目标：部署到指定监听器。 + DEPLOY_TARGET_LISTENER = "listener" ) diff --git a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go index 6f5ea6048..43093f6bd 100644 --- a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go +++ b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go @@ -22,13 +22,13 @@ type DeployerConfig struct { AccessKeySecret string `json:"accessKeySecret"` // 火山引擎地域。 Region string `json:"region"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 负载均衡实例 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LOADBALANCER] 时必填。 LoadbalancerId string `json:"loadbalancerId,omitempty"` // 负载均衡监听器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + // 部署目标为 [DEPLOY_TARGET_LISTENER] 时必填。 ListenerId string `json:"listenerId,omitempty"` } @@ -87,20 +87,20 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_LOADBALANCER: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_LOADBALANCER: if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { return nil, err } - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: if err := d.deployToListener(ctx, upres.CertId); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go index 70f3e2827..b1019bf9c 100644 --- a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go +++ b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb_test.go @@ -45,7 +45,7 @@ func TestProvider(t *testing.T) { AccessKeyId: fAccessKeyId, AccessKeySecret: fAccessKeySecret, Region: fRegion, - ResourceType: impl.RESOURCE_TYPE_LISTENER, + DeployTarget: impl.DEPLOY_TARGET_LISTENER, ListenerId: fListenerId, }) if err != nil { diff --git a/pkg/core/deployer/providers/zenlayer-cdn/consts.go b/pkg/core/deployer/providers/zenlayer-cdn/consts.go index 165bd3750..bfe31d9d9 100644 --- a/pkg/core/deployer/providers/zenlayer-cdn/consts.go +++ b/pkg/core/deployer/providers/zenlayer-cdn/consts.go @@ -1,10 +1,10 @@ package zenlayercdn const ( - // 资源类型：替换指定域名的证书。 - RESOURCE_TYPE_DOMAIN = "domain" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：替换指定域名的证书。 + DEPLOY_TARGET_DOMAIN = "domain" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) const ( diff --git a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go index e5b184545..6e39909a7 100644 --- a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go +++ b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go @@ -25,10 +25,10 @@ type DeployerConfig struct { AccessKeyPassword string `json:"accessKeyPassword"` // Zenlayer 资源组 ID。 ResourceGroupId string `json:"resourceGroupId,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 全球网络加速器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_ACCELERATOR] 时必填。 + // 部署目标为 [DEPLOY_TARGET_ACCELERATOR] 时必填。 AcceleratorId string `json:"acceleratorId,omitempty"` // 域名匹配模式。 // 零值时默认值 [DOMAIN_MATCH_PATTERN_EXACT]。 @@ -36,7 +36,7 @@ type DeployerConfig struct { // 加速域名（支持泛域名）。 Domain string `json:"domain"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -87,20 +87,20 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_DOMAIN: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_DOMAIN: if err := d.deployToDomain(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn_test.go b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn_test.go index a86f607be..c7cdb93be 100644 --- a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn_test.go +++ b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn_test.go @@ -44,7 +44,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, AccessKeyPassword: fAccessKeyPassword, - ResourceType: impl.RESOURCE_TYPE_DOMAIN, + DeployTarget: impl.DEPLOY_TARGET_DOMAIN, DomainMatchPattern: impl.DOMAIN_MATCH_PATTERN_EXACT, Domain: fDomain, }) @@ -60,7 +60,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, AccessKeyPassword: fAccessKeyPassword, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/pkg/core/deployer/providers/zenlayer-ga/consts.go b/pkg/core/deployer/providers/zenlayer-ga/consts.go index f6208113b..3d362b9ce 100644 --- a/pkg/core/deployer/providers/zenlayer-ga/consts.go +++ b/pkg/core/deployer/providers/zenlayer-ga/consts.go @@ -1,8 +1,8 @@ package zenlayerga const ( - // 资源类型：部署到指定全球网络加速器。 - RESOURCE_TYPE_ACCELERATOR = "accelerator" - // 资源类型：替换指定证书。 - RESOURCE_TYPE_CERTIFICATE = "certificate" + // 部署目标：部署到指定全球网络加速器。 + DEPLOY_TARGET_ACCELERATOR = "accelerator" + // 部署目标：替换指定证书。 + DEPLOY_TARGET_CERTIFICATE = "certificate" ) diff --git a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go index 6554de9fe..1ecd50331 100644 --- a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go +++ b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go @@ -22,13 +22,13 @@ type DeployerConfig struct { AccessKeyPassword string `json:"accessKeyPassword"` // Zenlayer 资源组 ID。 ResourceGroupId string `json:"resourceGroupId,omitempty"` - // 部署资源类型。 - ResourceType string `json:"resourceType"` + // 部署目标。 + DeployTarget string `json:"deployTarget"` // 加速器 ID。 - // 部署资源类型为 [RESOURCE_TYPE_ACCELERATOR] 时必填。 + // 部署目标为 [DEPLOY_TARGET_ACCELERATOR] 时必填。 AcceleratorId string `json:"acceleratorId,omitempty"` // 证书 ID。 - // 部署资源类型为 [RESOURCE_TYPE_CERTIFICATE] 时必填。 + // 部署目标为 [DEPLOY_TARGET_CERTIFICATE] 时必填。 CertificateId string `json:"certificateId,omitempty"` } @@ -79,20 +79,20 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { - // 根据部署资源类型决定部署方式 - switch d.config.ResourceType { - case RESOURCE_TYPE_ACCELERATOR: + // 根据部署目标决定业务流程 + switch d.config.DeployTarget { + case DEPLOY_TARGET_ACCELERATOR: if err := d.deployToAccelerator(ctx, certPEM, privkeyPEM); err != nil { return nil, err } - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: if err := d.deployToCertificate(ctx, certPEM, privkeyPEM); err != nil { return nil, err } default: - return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) + return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } return &deployer.DeployResult{}, nil diff --git a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga_test.go b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga_test.go index 60df2a427..63a78afea 100644 --- a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga_test.go +++ b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga_test.go @@ -44,7 +44,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, AccessKeyPassword: fAccessKeyPassword, - ResourceType: impl.RESOURCE_TYPE_ACCELERATOR, + DeployTarget: impl.DEPLOY_TARGET_ACCELERATOR, AcceleratorId: fAcceleratorId, }) if err != nil { @@ -59,7 +59,7 @@ func TestProvider(t *testing.T) { provider, err := impl.NewDeployer(&impl.DeployerConfig{ AccessKeyId: fAccessKeyId, AccessKeyPassword: fAccessKeyPassword, - ResourceType: impl.RESOURCE_TYPE_CERTIFICATE, + DeployTarget: impl.DEPLOY_TARGET_CERTIFICATE, CertificateId: fCertificateId, }) if err != nil { diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProvider1Panel.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProvider1Panel.tsx index 42d070a18..9a590040c 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProvider1Panel.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProvider1Panel.tsx @@ -7,8 +7,8 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_WEBSITE = "website" as const; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_WEBSITE = "website" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const WEBSITE_MATCH_PATTERN_SPECIFIED = "specified" as const; const WEBSITE_MATCH_PATTERN_CERTSAN = "certsan" as const; @@ -24,7 +24,7 @@ const BizDeployNodeConfigFieldsProvider1Panel = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); const fieldWebsiteMatchPattern = Form.useWatch([parentNamePath, "websiteMatchPattern"], { form: formInst, preserve: true }); return ( @@ -41,21 +41,21 @@ const BizDeployNodeConfigFieldsProvider1Panel = () => { ({ + options={[DEPLOY_TARGET_CERTIFICATE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.apisix_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.apisix_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_CERTIFICATE, + deployTarget: DEPLOY_TARGET_CERTIFICATE, }; }; @@ -70,12 +70,12 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_CERTIFICATE]), + deployTarget: z.enum([DEPLOY_TARGET_CERTIFICATE]), certificateId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_CERTIFICATE: + switch (values.deployTarget) { + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.string().nonempty(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunALB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunALB.tsx index 710dccf18..2dc49732c 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunALB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunALB.tsx @@ -8,8 +8,8 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; -const RESOURCE_TYPE_LISTENER = "listener" as const; +const DEPLOY_TARGET_LOADBALANCER = "loadbalancer" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; const BizDeployNodeConfigFieldsProviderAliyunALB = () => { const { i18n, t } = useTranslation(); @@ -22,7 +22,7 @@ const BizDeployNodeConfigFieldsProviderAliyunALB = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -37,21 +37,21 @@ const BizDeployNodeConfigFieldsProviderAliyunALB = () => { ({ + options={[DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.aliyun_clb_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.aliyun_clb_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> @@ -61,7 +61,7 @@ const BizDeployNodeConfigFieldsProviderAliyunCLB = () => { - + { - + { const getInitialValues = (): Nullish>> => { return { region: "", - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, loadbalancerId: "", listenerPort: 443, }; @@ -103,7 +103,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ region: z.string().nonempty(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER]), loadbalancerId: z.string().nonempty(), listenerPort: z.union([z.string(), z.int().positive()]).nullish(), domain: z @@ -115,8 +115,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LISTENER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LISTENER: { const scListenerPort = z.coerce.number().refine((v) => isPortNumber(v), t("common.errmsg.port_invalid")); const spListenerPort = scListenerPort.safeParse(values.listenerPort); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunGA.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunGA.tsx index 9084a6adc..a7995b93e 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunGA.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunGA.tsx @@ -8,8 +8,8 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_ACCELERATOR = "accelerator" as const; -const RESOURCE_TYPE_LISTENER = "listener" as const; +const DEPLOY_TARGET_ACCELERATOR = "accelerator" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; const BizDeployNodeConfigFieldsProviderAliyunGA = () => { const { i18n, t } = useTranslation(); @@ -22,22 +22,22 @@ const BizDeployNodeConfigFieldsProviderAliyunGA = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> - + { - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, acceleratorId: "", }; }; @@ -90,7 +90,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_ACCELERATOR, RESOURCE_TYPE_LISTENER]), + deployTarget: z.enum([DEPLOY_TARGET_ACCELERATOR, DEPLOY_TARGET_LISTENER]), acceleratorId: z.string().nonempty(), listenerId: z.string().nullish(), domain: z @@ -102,8 +102,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LISTENER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LISTENER: { const scListenerId = z.string().nonempty(); const spListenerId = scListenerId.safeParse(values.listenerId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunNLB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunNLB.tsx index 559cbf050..841d53bf8 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunNLB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderAliyunNLB.tsx @@ -7,8 +7,8 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; -const RESOURCE_TYPE_LISTENER = "listener" as const; +const DEPLOY_TARGET_LOADBALANCER = "loadbalancer" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; const BizDeployNodeConfigFieldsProviderAliyunNLB = () => { const { i18n, t } = useTranslation(); @@ -21,7 +21,7 @@ const BizDeployNodeConfigFieldsProviderAliyunNLB = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -36,21 +36,21 @@ const BizDeployNodeConfigFieldsProviderAliyunNLB = () => { ({ + options={[DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.baiducloud_appblb_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.baiducloud_appblb_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> @@ -61,7 +61,7 @@ const BizDeployNodeConfigFieldsProviderBaiduCloudAppBLB = () => { - + { - + { const getInitialValues = (): Nullish>> => { return { region: "", - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, loadbalancerId: "", listenerPort: 443, }; @@ -103,7 +103,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ region: z.string().nonempty(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER]), loadbalancerId: z.string().nonempty(), listenerPort: z.union([z.string(), z.int().positive()]).nullish(), domain: z @@ -115,8 +115,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LISTENER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LISTENER: { const scListenerPort = z.coerce.number().refine((v) => isPortNumber(v), t("common.errmsg.port_invalid")); const spListenerPort = scListenerPort.safeParse(values.listenerPort); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudBLB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudBLB.tsx index db62e07ad..f5f2d9274 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudBLB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaiduCloudBLB.tsx @@ -8,8 +8,8 @@ import { isDomain, isPortNumber } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; -const RESOURCE_TYPE_LISTENER = "listener" as const; +const DEPLOY_TARGET_LOADBALANCER = "loadbalancer" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; const BizDeployNodeConfigFieldsProviderBaiduCloudBLB = () => { const { i18n, t } = useTranslation(); @@ -22,7 +22,7 @@ const BizDeployNodeConfigFieldsProviderBaiduCloudBLB = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -37,17 +37,17 @@ const BizDeployNodeConfigFieldsProviderBaiduCloudBLB = () => { - + { - + { const getInitialValues = (): Nullish>> => { return { region: "", - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, loadbalancerId: "", listenerPort: 443, }; @@ -103,7 +103,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ region: z.string().nonempty(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER]), loadbalancerId: z.string().nonempty(), listenerPort: z.union([z.string(), z.int().positive()]).nullish(), domain: z @@ -115,8 +115,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LISTENER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LISTENER: { const scListenerPort = z.coerce.number().refine((v) => isPortNumber(v), t("common.errmsg.port_invalid")); const spListenerPort = scListenerPort.safeParse(values.listenerPort); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaishanCDN.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaishanCDN.tsx index 734c60b55..1396f57ef 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaishanCDN.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderBaishanCDN.tsx @@ -8,8 +8,8 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_DOMAIN = "domain" as const; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_DOMAIN = "domain" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const DOMAIN_MATCH_PATTERN_EXACT = "exact" as const; @@ -24,27 +24,27 @@ const BizDeployNodeConfigFieldsProviderBaishanCDN = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); const fieldDomainMatchPattern = Form.useWatch([parentNamePath, "domainMatchPattern"], { form: formInst, preserve: true }); return ( <> ({ + options={[DEPLOY_TARGET_WEBSITE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.cpanel_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.cpanel_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_WEBSITE, + deployTarget: DEPLOY_TARGET_WEBSITE, domain: "", }; }; @@ -66,12 +66,12 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_WEBSITE]), + deployTarget: z.enum([DEPLOY_TARGET_WEBSITE]), domain: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_WEBSITE: + switch (values.deployTarget) { + case DEPLOY_TARGET_WEBSITE: { const scDomain = z.string().refine((v) => isDomain(v), t("common.errmsg.domain_invalid")); const spDomain = scDomain.safeParse(values.domain); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderCTCCCloudELB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderCTCCCloudELB.tsx index bf273a037..26da59fe9 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderCTCCCloudELB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderCTCCCloudELB.tsx @@ -7,8 +7,8 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; -const RESOURCE_TYPE_LISTENER = "listener" as const; +const DEPLOY_TARGET_LOADBALANCER = "loadbalancer" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; const BizDeployNodeConfigFieldsProviderCTCCCloudELB = () => { const { i18n, t } = useTranslation(); @@ -21,7 +21,7 @@ const BizDeployNodeConfigFieldsProviderCTCCCloudELB = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -36,21 +36,21 @@ const BizDeployNodeConfigFieldsProviderCTCCCloudELB = () => { ({ + options={[DEPLOY_TARGET_WEBSITE, DEPLOY_TARGET_CERTIFICATE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.cdnfly_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.cdnfly_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_WEBSITE, + deployTarget: DEPLOY_TARGET_WEBSITE, }; }; @@ -78,13 +78,13 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_WEBSITE, RESOURCE_TYPE_CERTIFICATE]), + deployTarget: z.enum([DEPLOY_TARGET_WEBSITE, DEPLOY_TARGET_CERTIFICATE]), siteId: z.union([z.string(), z.int()]).nullish(), certificateId: z.union([z.string(), z.int()]).nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_WEBSITE: + switch (values.deployTarget) { + case DEPLOY_TARGET_WEBSITE: { const scSiteId = z.coerce.number().int().positive(); const spSiteId = scSiteId.safeParse(values.siteId); @@ -98,7 +98,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) } break; - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.coerce.number().int().positive(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderFlexCDN.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderFlexCDN.tsx index 1a9677b46..3d3d11678 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderFlexCDN.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderFlexCDN.tsx @@ -7,7 +7,7 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const BizDeployNodeConfigFieldsProviderFlexCDN = () => { const { i18n, t } = useTranslation(); @@ -20,26 +20,26 @@ const BizDeployNodeConfigFieldsProviderFlexCDN = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> ({ + options={[DEPLOY_TARGET_CERTIFICATE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.goedge_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.goedge_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_CERTIFICATE, + deployTarget: DEPLOY_TARGET_CERTIFICATE, }; }; @@ -65,12 +65,12 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_CERTIFICATE]), + deployTarget: z.enum([DEPLOY_TARGET_CERTIFICATE]), certificateId: z.union([z.string(), z.int()]).nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_CERTIFICATE: + switch (values.deployTarget) { + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.string().nonempty(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderHuaweiCloudAPIG.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderHuaweiCloudAPIG.tsx index f064884d2..ba2303bab 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderHuaweiCloudAPIG.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderHuaweiCloudAPIG.tsx @@ -7,7 +7,7 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const BizDeployNodeConfigFieldsProviderHuaweiCloudAPIG = () => { const { i18n, t } = useTranslation(); @@ -20,7 +20,7 @@ const BizDeployNodeConfigFieldsProviderHuaweiCloudAPIG = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -35,21 +35,21 @@ const BizDeployNodeConfigFieldsProviderHuaweiCloudAPIG = () => { ({ + options={[DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER, DEPLOY_TARGET_CERTIFICATE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.huaweicloud_elb_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.huaweicloud_elb_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { - + { - + { const getInitialValues = (): Nullish>> => { return { region: "", - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, }; }; @@ -103,14 +103,14 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ region: z.string().nonempty(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER, RESOURCE_TYPE_CERTIFICATE]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER, DEPLOY_TARGET_CERTIFICATE]), loadbalancerId: z.string().nullish(), listenerId: z.string().nullish(), certificateId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LOADBALANCER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LOADBALANCER: { const scLoadbalancerId = z.string().nonempty(); const spLoadbalancerId = scLoadbalancerId.safeParse(values.loadbalancerId); @@ -124,7 +124,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) } break; - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: { const scListenerId = z.string().nonempty(); const spListenerId = scListenerId.safeParse(values.listenerId); @@ -138,7 +138,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) } break; - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.string().nonempty(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderHuaweiCloudWAF.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderHuaweiCloudWAF.tsx index a48d9a30a..efef59657 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderHuaweiCloudWAF.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderHuaweiCloudWAF.tsx @@ -8,9 +8,9 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_CLOUDSERVER = "cloudserver" as const; -const RESOURCE_TYPE_PREMIUMHOST = "premiumhost" as const; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_CLOUDSERVER = "cloudserver" as const; +const DEPLOY_TARGET_PREMIUMHOST = "premiumhost" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const BizDeployNodeConfigFieldsProviderHuaweiCloudWAF = () => { const { i18n, t } = useTranslation(); @@ -23,7 +23,7 @@ const BizDeployNodeConfigFieldsProviderHuaweiCloudWAF = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -38,21 +38,21 @@ const BizDeployNodeConfigFieldsProviderHuaweiCloudWAF = () => { ({ + options={[DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.jdcloud_alb_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.jdcloud_alb_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { - + { - + { const getInitialValues = (): Nullish>> => { return { regionId: "", - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, }; }; @@ -103,7 +103,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ regionId: z.string().nonempty(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER]), loadbalancerId: z.string().nullish(), listenerId: z.string().nullish(), domain: z @@ -115,8 +115,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LOADBALANCER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LOADBALANCER: { const scLoadbalancerId = z.string().nonempty(); const spLoadbalancerId = scLoadbalancerId.safeParse(values.loadbalancerId); @@ -130,7 +130,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) } break; - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: { const scListenerId = z.string().nonempty(); const spListenerId = scListenerId.safeParse(values.listenerId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderKong.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderKong.tsx index 7789ed5a9..686752aee 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderKong.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderKong.tsx @@ -8,7 +8,7 @@ import Tips from "@/components/Tips"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const BizDeployNodeConfigFieldsProviderKong = () => { const { i18n, t } = useTranslation(); @@ -21,7 +21,7 @@ const BizDeployNodeConfigFieldsProviderKong = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -30,17 +30,17 @@ const BizDeployNodeConfigFieldsProviderKong = () => { - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_CERTIFICATE, + deployTarget: DEPLOY_TARGET_CERTIFICATE, }; }; @@ -80,13 +80,13 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.literal(RESOURCE_TYPE_CERTIFICATE), + deployTarget: z.literal(DEPLOY_TARGET_CERTIFICATE), workspace: z.string().nullish(), certificateId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_CERTIFICATE: + switch (values.deployTarget) { + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.string().nonempty(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderKsyunCDN.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderKsyunCDN.tsx index ac39511de..db0de9f42 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderKsyunCDN.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderKsyunCDN.tsx @@ -8,8 +8,8 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_DOMAIN = "domain" as const; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_DOMAIN = "domain" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const DOMAIN_MATCH_PATTERN_EXACT = "exact" as const; const DOMAIN_MATCH_PATTERN_WILDCARD = "wildcard" as const; @@ -26,27 +26,27 @@ const BizDeployNodeConfigFieldsProviderKsyunCDN = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); const fieldDomainMatchPattern = Form.useWatch([parentNamePath, "domainMatchPattern"], { form: formInst, preserve: true }); return ( <> ({ + options={[DEPLOY_TARGET_CERTIFICATE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.ksyun_slb_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.ksyun_slb_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_CERTIFICATE, + deployTarget: DEPLOY_TARGET_CERTIFICATE, certificateId: "", }; }; @@ -66,12 +66,12 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_CERTIFICATE]), + deployTarget: z.enum([DEPLOY_TARGET_CERTIFICATE]), certificateId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_CERTIFICATE: + switch (values.deployTarget) { + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.string().nonempty(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderLeCDN.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderLeCDN.tsx index a07468658..2cbce1ca6 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderLeCDN.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderLeCDN.tsx @@ -7,7 +7,7 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const BizDeployNodeConfigFieldsProviderLeCDN = () => { const { i18n, t } = useTranslation(); @@ -20,26 +20,26 @@ const BizDeployNodeConfigFieldsProviderLeCDN = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> ({ + options={[DEPLOY_TARGET_WEBSITE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.netlify_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.netlify_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_WEBSITE, + deployTarget: DEPLOY_TARGET_WEBSITE, siteId: "", }; }; @@ -66,12 +66,12 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_WEBSITE]), + deployTarget: z.enum([DEPLOY_TARGET_WEBSITE]), siteId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_WEBSITE: + switch (values.deployTarget) { + case DEPLOY_TARGET_WEBSITE: { const scSiteId = z.string().nonempty(); const spSiteId = scSiteId.safeParse(values.siteId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderNginxProxyManager.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderNginxProxyManager.tsx index 83b8bf357..d0ef283d8 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderNginxProxyManager.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderNginxProxyManager.tsx @@ -7,8 +7,8 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_HOST = "host" as const; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_HOST = "host" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const HOST_MATCH_PATTERN_SPECIFIED = "specified" as const; const HOST_MATCH_PATTERN_CERTSAN = "certsan" as const; @@ -29,27 +29,27 @@ const BizDeployNodeConfigFieldsProviderNginxProxyManager = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); const fieldHostMatchPattern = Form.useWatch([parentNamePath, "hostMatchPattern"], { form: formInst, preserve: true }); return ( <> ({ + options={[DEPLOY_TARGET_WEBSITE, DEPLOY_TARGET_CERTIFICATE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.ratpanel_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.ratpanel_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_WEBSITE, + deployTarget: DEPLOY_TARGET_WEBSITE, siteNames: "", }; }; @@ -94,13 +94,13 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_WEBSITE, RESOURCE_TYPE_CERTIFICATE]), + deployTarget: z.enum([DEPLOY_TARGET_WEBSITE, DEPLOY_TARGET_CERTIFICATE]), siteNames: z.string().nullish(), certificateId: z.union([z.string(), z.int().positive()]).nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_WEBSITE: + switch (values.deployTarget) { + case DEPLOY_TARGET_WEBSITE: { const scSiteNames = z .string() @@ -119,7 +119,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) } break; - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.coerce.number().int().positive(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderSafeLine.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderSafeLine.tsx index 4e59cb2a2..338791596 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderSafeLine.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderSafeLine.tsx @@ -8,7 +8,7 @@ import Tips from "@/components/Tips"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const BizDeployNodeConfigFieldsProviderSafeLine = () => { const { i18n, t } = useTranslation(); @@ -21,7 +21,7 @@ const BizDeployNodeConfigFieldsProviderSafeLine = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -30,21 +30,21 @@ const BizDeployNodeConfigFieldsProviderSafeLine = () => { ({ + options={[DEPLOY_TARGET_CERTIFICATE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.samwaf_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.samwaf_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_CERTIFICATE, + deployTarget: DEPLOY_TARGET_CERTIFICATE, }; }; @@ -70,12 +70,12 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_CERTIFICATE]), + deployTarget: z.enum([DEPLOY_TARGET_CERTIFICATE]), certificateId: z.union([z.string(), z.int().positive()]).nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_CERTIFICATE: + switch (values.deployTarget) { + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.coerce.number().int().positive(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderTencentCloudCLB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderTencentCloudCLB.tsx index affcc7865..acd5b7919 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderTencentCloudCLB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderTencentCloudCLB.tsx @@ -8,9 +8,9 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; -const RESOURCE_TYPE_LISTENER = "listener" as const; -const RESOURCE_TYPE_RULEDOMAIN = "ruledomain" as const; +const DEPLOY_TARGET_LOADBALANCER = "loadbalancer" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; +const DEPLOY_TARGET_RULEDOMAIN = "ruledomain" as const; const BizDeployNodeConfigFieldsProviderTencentCloudCLB = () => { const { i18n, t } = useTranslation(); @@ -23,7 +23,7 @@ const BizDeployNodeConfigFieldsProviderTencentCloudCLB = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -48,17 +48,17 @@ const BizDeployNodeConfigFieldsProviderTencentCloudCLB = () => { - + { - + { const getInitialValues = (): Nullish>> => { return { region: "", - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, loadbalancerId: "", }; }; @@ -112,15 +112,15 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ endpoint: z.string().nullish(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER, RESOURCE_TYPE_RULEDOMAIN]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER, DEPLOY_TARGET_RULEDOMAIN]), region: z.string().nonempty(), loadbalancerId: z.string().nonempty(), listenerId: z.string().nullish(), domain: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LISTENER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LISTENER: { const scListenerId = z.string().nonempty(); const spListenerId = scListenerId.safeParse(values.listenerId); @@ -134,7 +134,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) } break; - case RESOURCE_TYPE_RULEDOMAIN: + case DEPLOY_TARGET_RULEDOMAIN: { const scListenerId = z.string().nonempty(); const spListenerId = scListenerId.safeParse(values.listenerId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderTencentCloudGAAP.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderTencentCloudGAAP.tsx index 6350bb049..ac0dc04a7 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderTencentCloudGAAP.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderTencentCloudGAAP.tsx @@ -7,7 +7,7 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LISTENER = "listener" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; const BizDeployNodeConfigFieldsProviderTencentCloudGAAP = () => { const { i18n, t } = useTranslation(); @@ -20,7 +20,7 @@ const BizDeployNodeConfigFieldsProviderTencentCloudGAAP = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -35,17 +35,17 @@ const BizDeployNodeConfigFieldsProviderTencentCloudGAAP = () => { - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, }; }; @@ -86,13 +86,13 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ endpoint: z.string().nullish(), - resourceType: z.enum([RESOURCE_TYPE_LISTENER]), + deployTarget: z.enum([DEPLOY_TARGET_LISTENER]), proxyId: z.string().nullish(), listenerId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LISTENER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LISTENER: { const scListenerId = z.string().nonempty(); const spListenerId = scListenerId.safeParse(values.listenerId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUALB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUALB.tsx index 0b2548040..ba1b1856c 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUALB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUALB.tsx @@ -8,8 +8,8 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; -const RESOURCE_TYPE_LISTENER = "listener" as const; +const DEPLOY_TARGET_LOADBALANCER = "loadbalancer" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; const BizDeployNodeConfigFieldsProviderUCloudUALB = () => { const { i18n, t } = useTranslation(); @@ -22,7 +22,7 @@ const BizDeployNodeConfigFieldsProviderUCloudUALB = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -37,17 +37,17 @@ const BizDeployNodeConfigFieldsProviderUCloudUALB = () => { - + { - + { const getInitialValues = (): Nullish>> => { return { region: "", - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, loadbalancerId: "", listenerId: "", }; @@ -103,7 +103,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ endpoint: z.string().nullish(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER]), region: z.string().nonempty(), loadbalancerId: z.string().nonempty(), listenerId: z.string().nullish(), @@ -116,8 +116,8 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) }, t("common.errmsg.domain_invalid")), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LISTENER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LISTENER: { const scListenerId = z.string().nonempty(); const spListenerId = scListenerId.safeParse(values.listenerId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUCLB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUCLB.tsx index ee223e45f..e3cdb99d4 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUCLB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUCloudUCLB.tsx @@ -7,8 +7,8 @@ import Show from "@/components/Show"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; -const RESOURCE_TYPE_VSERVER = "vserver" as const; +const DEPLOY_TARGET_LOADBALANCER = "loadbalancer" as const; +const DEPLOY_TARGET_VSERVER = "vserver" as const; const BizDeployNodeConfigFieldsProviderUCloudUCLB = () => { const { i18n, t } = useTranslation(); @@ -21,7 +21,7 @@ const BizDeployNodeConfigFieldsProviderUCloudUCLB = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -36,17 +36,17 @@ const BizDeployNodeConfigFieldsProviderUCloudUCLB = () => { - + { const getInitialValues = (): Nullish>> => { return { region: "", - resourceType: RESOURCE_TYPE_VSERVER, + deployTarget: DEPLOY_TARGET_VSERVER, loadbalancerId: "", vserverId: "", }; @@ -90,14 +90,14 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ endpoint: z.string().nullish(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_VSERVER]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_VSERVER]), region: z.string().nonempty(), loadbalancerId: z.string().nonempty(), vserverId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_VSERVER: + switch (values.deployTarget) { + case DEPLOY_TARGET_VSERVER: { const scVserverId = z.string().nonempty(); const spVserverId = scVserverId.safeParse(values.vserverId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderVolcEngineALB.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderVolcEngineALB.tsx index 358876540..712a67394 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderVolcEngineALB.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderVolcEngineALB.tsx @@ -8,8 +8,8 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; -const RESOURCE_TYPE_LISTENER = "listener" as const; +const DEPLOY_TARGET_LOADBALANCER = "loadbalancer" as const; +const DEPLOY_TARGET_LISTENER = "listener" as const; const BizDeployNodeConfigFieldsProviderVolcEngineALB = () => { const { i18n, t } = useTranslation(); @@ -22,7 +22,7 @@ const BizDeployNodeConfigFieldsProviderVolcEngineALB = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); return ( <> @@ -37,21 +37,21 @@ const BizDeployNodeConfigFieldsProviderVolcEngineALB = () => { ({ + options={[DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.volcengine_clb_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.volcengine_clb_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { - + { const getInitialValues = (): Nullish>> => { return { region: "", - resourceType: RESOURCE_TYPE_LISTENER, + deployTarget: DEPLOY_TARGET_LISTENER, }; }; @@ -90,13 +90,13 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ region: z.string().nonempty(), - resourceType: z.enum([RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER]), + deployTarget: z.enum([DEPLOY_TARGET_LOADBALANCER, DEPLOY_TARGET_LISTENER]), loadbalancerId: z.string().nullish(), listenerId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_LOADBALANCER: + switch (values.deployTarget) { + case DEPLOY_TARGET_LOADBALANCER: { const scLoadbalancerId = z.string().nonempty(); const spLoadbalancerId = scLoadbalancerId.safeParse(values.loadbalancerId); @@ -110,7 +110,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) } break; - case RESOURCE_TYPE_LISTENER: + case DEPLOY_TARGET_LISTENER: { const scListenerId = z.string().nonempty(); const spListenerId = scListenerId.safeParse(values.listenerId); diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderZenlayerCDN.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderZenlayerCDN.tsx index da82a3232..fd9366bd6 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderZenlayerCDN.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderZenlayerCDN.tsx @@ -8,8 +8,8 @@ import { isDomain } from "@/utils/validator"; import { useFormNestedFieldsContext } from "./_context"; -const RESOURCE_TYPE_DOMAIN = "domain" as const; -const RESOURCE_TYPE_CERTIFICATE = "certificate" as const; +const DEPLOY_TARGET_DOMAIN = "domain" as const; +const DEPLOY_TARGET_CERTIFICATE = "certificate" as const; const DOMAIN_MATCH_PATTERN_EXACT = "exact" as const; const DOMAIN_MATCH_PATTERN_WILDCARD = "wildcard" as const; @@ -26,27 +26,27 @@ const BizDeployNodeConfigFieldsProviderZenlayerCDN = () => { const formInst = Form.useFormInstance(); const initialValues = getInitialValues(); - const fieldResourceType = Form.useWatch([parentNamePath, "resourceType"], formInst); + const fieldResourceType = Form.useWatch([parentNamePath, "deployTarget"], formInst); const fieldDomainMatchPattern = Form.useWatch([parentNamePath, "domainMatchPattern"], { form: formInst, preserve: true }); return ( <> ({ + options={[DEPLOY_TARGET_ACCELERATOR, DEPLOY_TARGET_CERTIFICATE].map((s) => ({ value: s, - label: t(`workflow_node.deploy.form.zenlayer_ga_resource_type.option.${s}.label`), + label: t(`workflow_node.deploy.form.zenlayer_ga_deploy_target.option.${s}.label`), }))} - placeholder={t("workflow_node.deploy.form.shared_resource_type.placeholder")} + placeholder={t("workflow_node.deploy.form.shared_deploy_target.placeholder")} /> - + { - + { const getInitialValues = (): Nullish>> => { return { - resourceType: RESOURCE_TYPE_ACCELERATOR, + deployTarget: DEPLOY_TARGET_ACCELERATOR, acceleratorId: "", }; }; @@ -79,13 +79,13 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) return z .object({ - resourceType: z.enum([RESOURCE_TYPE_ACCELERATOR, RESOURCE_TYPE_CERTIFICATE]), + deployTarget: z.enum([DEPLOY_TARGET_ACCELERATOR, DEPLOY_TARGET_CERTIFICATE]), acceleratorId: z.string().nullish(), certificateId: z.string().nullish(), }) .superRefine((values, ctx) => { - switch (values.resourceType) { - case RESOURCE_TYPE_ACCELERATOR: + switch (values.deployTarget) { + case DEPLOY_TARGET_ACCELERATOR: { const scAcceleratorId = z.string().nonempty(); const spAcceleratorId = scAcceleratorId.safeParse(values.acceleratorId); @@ -99,7 +99,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) } break; - case RESOURCE_TYPE_CERTIFICATE: + case DEPLOY_TARGET_CERTIFICATE: { const scCertificateId = z.string().nonempty(); const spCertificateId = scCertificateId.safeParse(values.certificateId); diff --git a/ui/src/i18n/resources/en/nls.workflow.nodes.json b/ui/src/i18n/resources/en/nls.workflow.nodes.json index baf5594e2..7c3f8ecea 100644 --- a/ui/src/i18n/resources/en/nls.workflow.nodes.json +++ b/ui/src/i18n/resources/en/nls.workflow.nodes.json @@ -474,9 +474,9 @@ } }, - "shared_resource_type": { - "label": "Resource type", - "placeholder": "Please select resource type" + "shared_deploy_target": { + "label": "Certificate deploy target", + "placeholder": "Please select certificate deploy target" }, "shared_domain_match_pattern": { "label": "Domain match pattern", @@ -504,7 +504,7 @@ "help": "Notes: Only used for 1Panel v2+.", "tooltip": "You can find it on 1Panel dashboard." }, - "1panel_resource_type": { + "1panel_deploy_target": { "option": { "website": { "label": "Website" @@ -545,7 +545,7 @@ "placeholder": "Please enter Alibaba Cloud ALB region (e.g. cn-hangzhou)", "tooltip": "For more information, see https://www.alibabacloud.com/help/en/slb/application-load-balancer/product-overview/supported-regions-and-zones" }, - "aliyun_alb_resource_type": { + "aliyun_alb_deploy_target": { "option": { "loadbalancer": { "label": "ALB load balancer" @@ -645,7 +645,7 @@ "placeholder": "Please enter Alibaba Cloud CLB region (e.g. cn-hangzhou)", "tooltip": "For more information, see https://www.alibabacloud.com/help/en/slb/classic-load-balancer/product-overview/regions-that-support-clb" }, - "aliyun_clb_resource_type": { + "aliyun_clb_deploy_target": { "option": { "loadbalancer": { "label": "CLB load balancer" @@ -734,7 +734,7 @@ "label": "Alibaba Cloud FC domain", "placeholder": "Please enter Alibaba Cloud FC domain name" }, - "aliyun_ga_resource_type": { + "aliyun_ga_deploy_target": { "option": { "accelerator": { "label": "GA accelerator" @@ -773,7 +773,7 @@ "placeholder": "Please enter Alibaba Cloud NLB region (e.g. cn-hangzhou)", "tooltip": "For more information, see https://www.alibabacloud.com/help/en/slb/network-load-balancer/product-overview/regions-that-support-nlb" }, - "aliyun_nlb_resource_type": { + "aliyun_nlb_deploy_target": { "option": { "loadbalancer": { "label": "NLB load balancer" @@ -861,7 +861,7 @@ "apisix": { "guide": "Requires APISIX v3.0 or higher." }, - "apisix_resource_type": { + "apisix_deploy_target": { "option": { "certificate": { "label": "SSL certificate" @@ -928,7 +928,7 @@ "placeholder": "Please enter Baidu Cloud BLB region (e.g. bj)", "tooltip": "For more information, see https://cloud.baidu.com/doc/BLB/s/cjwvxnzix" }, - "baiducloud_appblb_resource_type": { + "baiducloud_appblb_deploy_target": { "option": { "loadbalancer": { "label": "BLB load balancer" @@ -958,7 +958,7 @@ "placeholder": "Please enter Baidu Cloud BLB region (e.g. bj)", "tooltip": "For more information, see https://cloud.baidu.com/doc/BLB/s/cjwvxnzix" }, - "baiducloud_blb_resource_type": { + "baiducloud_blb_deploy_target": { "option": { "loadbalancer": { "label": "BLB load balancer" @@ -987,7 +987,7 @@ "label": "Baidu Cloud CDN domain", "placeholder": "Please enter Baidu Cloud CDN domain name" }, - "baishan_cdn_resource_type": { + "baishan_cdn_deploy_target": { "option": { "domain": { "label": "Domain" @@ -1141,7 +1141,7 @@ "label": "BytePlus CDN domain", "placeholder": "Please enter BytePlus CDN domain name" }, - "cdnfly_resource_type": { + "cdnfly_deploy_target": { "option": { "website": { "label": "Website" @@ -1161,7 +1161,7 @@ "placeholder": "Please enter Cdnfly certificate ID", "tooltip": "You can find it on Cdnfly dashboard." }, - "cpanel_resource_type": { + "cpanel_deploy_target": { "option": { "website": { "label": "Website" @@ -1185,7 +1185,7 @@ "placeholder": "Please enter CTCC StateCloud ELB region ID", "tooltip": "For more information, see https://www.ctyun.cn/document/10026755/10196575" }, - "ctcccloud_elb_resource_type": { + "ctcccloud_elb_deploy_target": { "option": { "certificate": { "label": "ELB certificate" @@ -1229,7 +1229,7 @@ "label": "Doge Cloud CDN domain", "placeholder": "Please enter Doge Cloud CDN domain name" }, - "flexcdn_resource_type": { + "flexcdn_deploy_target": { "option": { "certificate": { "label": "Certificate" @@ -1320,7 +1320,7 @@ "help": "Notes: Leave it blank to import a new certificate; otherwise, to replace the existing one.", "tooltip": "For more information, see https://cdn.gcore.com/ssl" }, - "goedge_resource_type": { + "goedge_deploy_target": { "option": { "certificate": { "label": "Certificate" @@ -1346,7 +1346,7 @@ "placeholder": "Please enter Huawei Cloud API gateway region (e.g. cn-north-1)", "tooltip": "For more information, see https://console-intl.huaweicloud.com/apiexplorer/#/endpoint" }, - "huaweicloud_apig_resource_type": { + "huaweicloud_apig_deploy_target": { "option": { "certificate": { "label": "API gateway certificate" @@ -1385,7 +1385,7 @@ "placeholder": "Please enter Huawei Cloud ELB region (e.g. cn-north-1)", "tooltip": "For more information, see https://console-intl.huaweicloud.com/apiexplorer/#/endpoint" }, - "huaweicloud_elb_resource_type": { + "huaweicloud_elb_deploy_target": { "option": { "loadbalancer": { "label": "ELB load balancer" @@ -1427,7 +1427,7 @@ "placeholder": "Please enter Huawei Cloud WAF region (e.g. cn-north-1)", "tooltip": "For more information, see https://console-intl.huaweicloud.com/apiexplorer/#/endpoint" }, - "huaweicloud_waf_resource_type": { + "huaweicloud_waf_deploy_target": { "option": { "cloudserver": { "label": "WAF cloud server" @@ -1454,7 +1454,7 @@ "placeholder": "Please enter JD Cloud ALB region ID (e.g. cn-north-1)", "tooltip": "For more information, see https://docs.jdcloud.com/en/common-declaration/api/introduction" }, - "jdcloud_alb_resource_type": { + "jdcloud_alb_deploy_target": { "option": { "loadbalancer": { "label": "ALB load balancer" @@ -1551,7 +1551,7 @@ "kong": { "guide": "Requires Kong v2.0 or higher." }, - "kong_resource_type": { + "kong_deploy_target": { "option": { "certificate": { "label": "SSL certificate" @@ -1568,7 +1568,7 @@ "placeholder": "Please enter Kong certificate ID", "tooltip": "You can find it on Kong dashboard." }, - "ksyun_cdn_resource_type": { + "ksyun_cdn_deploy_target": { "option": { "domain": { "label": "Domain" @@ -1587,7 +1587,7 @@ "placeholder": "Please enter Kingsoft Cloud CDN certificate ID", "tooltip": "For more information, see https://cdn.console.ksyun.com/" }, - "ksyun_slb_resource_type": { + "ksyun_slb_deploy_target": { "option": { "certificate": { "label": "Certificate" @@ -1599,7 +1599,7 @@ "placeholder": "Please enter Kingsoft Cloud SLB certificate ID", "tooltip": "For more information, see https://network.console.ksyun.com/index.html#!/slb/slbIndex" }, - "lecdn_resource_type": { + "lecdn_deploy_target": { "option": { "certificate": { "label": "Certificate" @@ -1719,7 +1719,7 @@ "placeholder": "Please enter Mohua Cloud virtual host domain ID", "tooltip": "For more information, see https://cloud.mhjz1.cn/service?groupid=328&language=english" }, - "netlify_resource_type": { + "netlify_deploy_target": { "option": { "website": { "label": "Website" @@ -1731,7 +1731,7 @@ "placeholder": "Please enter Netlify website ID", "tooltip": "For more information, see https://docs.netlify.com/api/get-started/#get-site" }, - "nginxproxymanager_resource_type": { + "nginxproxymanager_deploy_target": { "option": { "host": { "label": "Host" @@ -1830,7 +1830,7 @@ "ratpanel": { "guide": "Requires AcePanel v2.5 or higher." }, - "ratpanel_resource_type": { + "ratpanel_deploy_target": { "option": { "website": { "label": "Website" @@ -1926,7 +1926,7 @@ "safeline": { "guide": "Requires SafeLine v6.6 or higher." }, - "safeline_resource_type": { + "safeline_deploy_target": { "option": { "certificate": { "label": "Certificate" @@ -1941,7 +1941,7 @@ "samwaf": { "guide": "Requires SamWAF v1.3.20 or higher." }, - "samwaf_resource_type": { + "samwaf_deploy_target": { "option": { "certificate": { "label": "Certificate" @@ -2066,7 +2066,7 @@ "placeholder": "Please enter Tencent Cloud CLB region (e.g. ap-guangzhou)", "tooltip": "For more information, see https://www.tencentcloud.com/document/product/214/13629" }, - "tencentcloud_clb_resource_type": { + "tencentcloud_clb_deploy_target": { "option": { "loadbalancer": { "label": "CLB instance" @@ -2157,7 +2157,7 @@ "placeholder": "Please enter Tencent Cloud GAAP API endpoint (e.g. gaap.intl.tencentcloudapi.com)", "tooltip": "
  • gaap.intl.tencentcloudapi.com for Tencent Cloud International
  • gaap.tencentcloudapi.com for Tencent Cloud in China
" }, - "tencentcloud_gaap_resource_type": { + "tencentcloud_gaap_deploy_target": { "option": { "listener": { "label": "GAAP listener" @@ -2310,7 +2310,7 @@ "placeholder": "Please enter UCloud ALB region (e.g. cn-bj2)", "tooltip": "For more information, see https://www.ucloud-global.com/en/docs/api/summary/regionlist" }, - "ucloud_ualb_resource_type": { + "ucloud_ualb_deploy_target": { "option": { "loadbalancer": { "label": "UALB load balancer" @@ -2345,7 +2345,7 @@ "placeholder": "Please enter UCloud UCLB region (e.g. cn-bj2)", "tooltip": "For more information, see https://www.ucloud-global.com/en/docs/api/summary/regionlist" }, - "ucloud_uclb_resource_type": { + "ucloud_uclb_deploy_target": { "option": { "loadbalancer": { "label": "UCLB load balancer" @@ -2439,7 +2439,7 @@ "placeholder": "Please enter VolcEngine ALB region (e.g. cn-beijing)", "tooltip": "For more information, see https://www.volcengine.com/docs/6767/127501" }, - "volcengine_alb_resource_type": { + "volcengine_alb_deploy_target": { "option": { "loadbalancer": { "label": "ALB load balancer" @@ -2486,7 +2486,7 @@ "placeholder": "Please enter VolcEngine CLB region (e.g. cn-beijing)", "tooltip": "For more information, see https://www.volcengine.com/docs/6406/74892" }, - "volcengine_clb_resource_type": { + "volcengine_clb_deploy_target": { "option": { "loadbalancer": { "label": "CLB load balancer" @@ -2633,7 +2633,7 @@ "placeholder": "Please enter Webhook timeout", "unit": "seconds" }, - "zenlayer_cdn_resource_type": { + "zenlayer_cdn_deploy_target": { "option": { "domain": { "label": "Domain" @@ -2652,7 +2652,7 @@ "placeholder": "Please enter Zenlayer CDN certificate ID", "tooltip": "For more information, https://console.zenlayer.com/cdn/" }, - "zenlayer_ga_resource_type": { + "zenlayer_ga_deploy_target": { "option": { "accelerator": { "label": "Accelerator" diff --git a/ui/src/i18n/resources/zh/nls.workflow.nodes.json b/ui/src/i18n/resources/zh/nls.workflow.nodes.json index 5a0d8aedb..0783a892f 100644 --- a/ui/src/i18n/resources/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/resources/zh/nls.workflow.nodes.json @@ -473,7 +473,7 @@ } }, - "shared_resource_type": { + "shared_deploy_target": { "label": "证书部署方式", "placeholder": "请选择证书部署方式" }, @@ -503,7 +503,7 @@ "help": "提示：仅 1Panel v2+ 需要填写。不填写时，将替换主控节点证书；否则，将替换被控节点证书。", "tooltip": "请登录 1Panel 面板查看" }, - "1panel_resource_type": { + "1panel_deploy_target": { "option": { "website": { "label": "部署到指定网站" @@ -544,7 +544,7 @@ "placeholder": "请输入阿里云 ALB 服务地域（例如：cn-hangzhou）", "tooltip": "这是什么？请参阅 https://help.aliyun.com/zh/slb/application-load-balancer/product-overview/supported-regions-and-zones" }, - "aliyun_alb_resource_type": { + "aliyun_alb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS/QUIC 监听器" @@ -644,7 +644,7 @@ "placeholder": "请输入阿里云 CLB 服务地域（例如：cn-hangzhou）", "tooltip": "这是什么？请参阅 https://help.aliyun.com/zh/slb/classic-load-balancer/product-overview/regions-that-support-clb" }, - "aliyun_clb_resource_type": { + "aliyun_clb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS 监听" @@ -733,7 +733,7 @@ "label": "阿里云 FC 自定义域名", "placeholder": "请输入阿里云 FC 自定义域名" }, - "aliyun_ga_resource_type": { + "aliyun_ga_deploy_target": { "option": { "accelerator": { "label": "部署到指定全球加速器下的全部 HTTPS 监听" @@ -772,7 +772,7 @@ "placeholder": "请输入阿里云 NLB 服务地域（例如：cn-hangzhou）", "tooltip": "这是什么？请参阅 https://help.aliyun.com/zh/slb/network-load-balancer/product-overview/regions-that-support-nlb" }, - "aliyun_nlb_resource_type": { + "aliyun_nlb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS/QUIC 监听器" @@ -860,7 +860,7 @@ "apisix": { "guide": "需要 APISIX v3.0 或更高版本。" }, - "apisix_resource_type": { + "apisix_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -927,7 +927,7 @@ "placeholder": "请输入百度智能云 BLB 服务地域（例如：bj）", "tooltip": "这是什么？请参阅 https://cloud.baidu.com/doc/BLB/s/cjwvxnzix" }, - "baiducloud_appblb_resource_type": { + "baiducloud_appblb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS/SSL 监听" @@ -957,7 +957,7 @@ "placeholder": "请输入百度智能云 BLB 服务地域（例如：bj）", "tooltip": "这是什么？请参阅 https://cloud.baidu.com/doc/BLB/s/cjwvxnzix" }, - "baiducloud_blb_resource_type": { + "baiducloud_blb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS/SSL 监听" @@ -986,7 +986,7 @@ "label": "百度智能云 CDN 加速域名", "placeholder": "请输入百度智能云 CDN 加速域名" }, - "baishan_cdn_resource_type": { + "baishan_cdn_deploy_target": { "option": { "domain": { "label": "部署到指定加速域名" @@ -1140,7 +1140,7 @@ "label": "BytePlus CDN 域名", "placeholder": "请输入 BytePlus CDN 域名" }, - "cdnfly_resource_type": { + "cdnfly_deploy_target": { "option": { "website": { "label": "部署到指定网站" @@ -1160,7 +1160,7 @@ "placeholder": "请输入 Cdnfly 证书 ID", "tooltip": "请登录 Cdnfly 控制台查看" }, - "cpanel_resource_type": { + "cpanel_deploy_target": { "option": { "website": { "label": "部署到指定网站" @@ -1184,7 +1184,7 @@ "placeholder": "请输入天翼云 ELB 资源池 ID", "tooltip": "这是什么？请参阅 https://www.ctyun.cn/document/10026755/10196575" }, - "ctcccloud_elb_resource_type": { + "ctcccloud_elb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS 监听器" @@ -1225,7 +1225,7 @@ "label": "多吉云 CDN 加速域名", "placeholder": "请输入多吉云 CDN 加速域名" }, - "flexcdn_resource_type": { + "flexcdn_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -1316,7 +1316,7 @@ "help": "提示：不填写时，将上传新证书；否则，将替换原证书。", "tooltip": "这是什么？请参阅 https://cdn.gcore.com/ssl" }, - "goedge_resource_type": { + "goedge_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -1342,7 +1342,7 @@ "placeholder": "请输入华为云 API 网关服务区域（例如：cn-north-1）", "tooltip": "这是什么？请参阅 https://console.huaweicloud.com/apiexplorer/#/endpoint" }, - "huaweicloud_apig_resource_type": { + "huaweicloud_apig_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -1381,7 +1381,7 @@ "placeholder": "请输入华为云 ELB 服务区域（例如：cn-north-1）", "tooltip": "这是什么？请参阅 https://console.huaweicloud.com/apiexplorer/#/endpoint" }, - "huaweicloud_elb_resource_type": { + "huaweicloud_elb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS 监听器" @@ -1423,7 +1423,7 @@ "placeholder": "请输入华为云 WAF 服务区域（例如：cn-north-1）", "tooltip": "这是什么？请参阅 https://console.huaweicloud.com/apiexplorer/#/endpoint" }, - "huaweicloud_waf_resource_type": { + "huaweicloud_waf_deploy_target": { "option": { "cloudserver": { "label": "部署到指定云模式防护网站" @@ -1450,7 +1450,7 @@ "placeholder": "请输入京东云 ALB 服务地域 ID（例如：cn-north-1）", "tooltip": "这是什么？请参阅 https://docs.jdcloud.com/cn/common-declaration/api/introduction" }, - "jdcloud_alb_resource_type": { + "jdcloud_alb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS/TLS 监听" @@ -1547,7 +1547,7 @@ "kong": { "guide": "需要 Kong v2.0 或更高版本。" }, - "kong_resource_type": { + "kong_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -1564,7 +1564,7 @@ "placeholder": "请输入 Kong 证书 ID", "tooltip": "请登录 Kong 控制台查看" }, - "ksyun_cdn_resource_type": { + "ksyun_cdn_deploy_target": { "option": { "domain": { "label": "部署到指定加速域名" @@ -1583,7 +1583,7 @@ "placeholder": "请输入金山云 CDN 证书 ID", "tooltip": "这是什么？请参阅 https://cdn.console.ksyun.com/" }, - "ksyun_slb_resource_type": { + "ksyun_slb_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -1595,7 +1595,7 @@ "placeholder": "请输入金山云 SLB 证书 ID", "tooltip": "这是什么？请参阅 https://network.console.ksyun.com/index.html#!/slb/slbIndex" }, - "lecdn_resource_type": { + "lecdn_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -1715,7 +1715,7 @@ "placeholder": "请输入嘿华云虚拟主机域名 ID", "tooltip": "这是什么？请参阅 https://cloud.mhjz1.cn/service?groupid=328" }, - "netlify_resource_type": { + "netlify_deploy_target": { "option": { "website": { "label": "部署到指定网站" @@ -1727,7 +1727,7 @@ "placeholder": "请输入 netlify 网站 ID", "tooltip": "这是什么？请参阅 https://docs.netlify.com/api/get-started/#get-site" }, - "nginxproxymanager_resource_type": { + "nginxproxymanager_deploy_target": { "option": { "host": { "label": "部署到指定主机" @@ -1826,7 +1826,7 @@ "ratpanel": { "guide": "需要耗子面板 v2.5 或更高版本。" }, - "ratpanel_resource_type": { + "ratpanel_deploy_target": { "option": { "website": { "label": "部署到指定网站" @@ -1922,7 +1922,7 @@ "safeline": { "guide": "需要雷池 v6.6 或更高版本。" }, - "safeline_resource_type": { + "safeline_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -1937,7 +1937,7 @@ "samwaf": { "guide": "需要 SamWAF v1.3.20 或更高版本。" }, - "samwaf_resource_type": { + "samwaf_deploy_target": { "option": { "certificate": { "label": "替换指定证书" @@ -2062,7 +2062,7 @@ "placeholder": "请输入腾讯云 CLB 服务地域（例如：ap-guangzhou）", "tooltip": "这是什么？请参阅 https://cloud.tencent.com/document/product/214/33415" }, - "tencentcloud_clb_resource_type": { + "tencentcloud_clb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定实例下的全部 HTTPS/TCPSSL/QUIC 监听器" @@ -2153,7 +2153,7 @@ "placeholder": "请输入腾讯云 GAAP 接口端点（例如：gaap.tencentcloudapi.com）", "tooltip": "这是什么？请参阅 https://cloud.tencent.com/document/product/608/36934
国际站用户请填写 gaap.intl.tencentcloudapi.com。" }, - "tencentcloud_gaap_resource_type": { + "tencentcloud_gaap_deploy_target": { "option": { "listener": { "label": "部署到指定监听器" @@ -2306,7 +2306,7 @@ "placeholder": "优刻得 UALB 服务地域（例如：cn-bj2）", "tooltip": "这是什么？请参阅 https://docs.ucloud.cn/api/summary/regionlist" }, - "ucloud_ualb_resource_type": { + "ucloud_ualb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS 监听器" @@ -2341,7 +2341,7 @@ "placeholder": "优刻得 UCLB 服务地域（例如：cn-bj2）", "tooltip": "这是什么？请参阅 https://docs.ucloud.cn/api/summary/regionlist" }, - "ucloud_uclb_resource_type": { + "ucloud_uclb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS VServer" @@ -2430,7 +2430,7 @@ "label": "又拍云云存储自定义域名", "placeholder": "请输入又拍云云存储自定义域名" }, - "volcengine_alb_resource_type": { + "volcengine_alb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS 监听" @@ -2477,7 +2477,7 @@ "label": "火山引擎服务地域", "placeholder": "请输入火山引擎证书中心服务地域（例如：cn-beijing）" }, - "volcengine_clb_resource_type": { + "volcengine_clb_deploy_target": { "option": { "loadbalancer": { "label": "部署到指定负载均衡器下的全部 HTTPS 监听" @@ -2629,7 +2629,7 @@ "placeholder": "请输入 Webhook 超时时间", "unit": "秒" }, - "zenlayer_cdn_resource_type": { + "zenlayer_cdn_deploy_target": { "option": { "domain": { "label": "部署到指定加速域名" @@ -2648,7 +2648,7 @@ "placeholder": "请输入 Zenlayer CDN 证书 ID", "tooltip": "这是什么？请参阅 https://console.zenlayer.com/cdn/" }, - "zenlayer_ga_resource_type": { + "zenlayer_ga_deploy_target": { "option": { "accelerator": { "label": "部署到指定全球网络加速器"