From d9a46b32fb9fc3e92b46d629d9183a222b1e32a2 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 1 Sep 2025 21:27:38 +0800 Subject: [PATCH] refactor: clean code --- internal/applicant/providers.go | 10 ++-- internal/certapply/applicators/registry.go | 10 ++-- .../certapply/applicators/sp_acmehttpreq.go | 12 ++--- .../certapply/applicators/sp_aliyun_dns.go | 8 ++-- .../certapply/applicators/sp_aliyun_esa.go | 10 ++-- .../certapply/applicators/sp_aws_route53.go | 12 ++--- .../certapply/applicators/sp_azure_dns.go | 12 ++--- .../applicators/sp_baiducloud_dns.go | 8 ++-- internal/certapply/applicators/sp_bunny.go | 6 +-- .../certapply/applicators/sp_cloudflare.go | 8 ++-- internal/certapply/applicators/sp_cloudns.go | 8 ++-- .../certapply/applicators/sp_cmcccloud_dns.go | 8 ++-- .../certapply/applicators/sp_constellix.go | 8 ++-- .../applicators/sp_ctcccloud_smartdns.go | 8 ++-- internal/certapply/applicators/sp_desec.go | 6 +-- .../certapply/applicators/sp_digitalocean.go | 6 +-- internal/certapply/applicators/sp_dnsla.go | 8 ++-- internal/certapply/applicators/sp_duckdns.go | 6 +-- internal/certapply/applicators/sp_dynv6.go | 6 +-- internal/certapply/applicators/sp_gcore.go | 6 +-- internal/certapply/applicators/sp_gname.go | 8 ++-- internal/certapply/applicators/sp_godaddy.go | 8 ++-- internal/certapply/applicators/sp_hetzner.go | 6 +-- .../applicators/sp_huaweicloud_dns.go | 10 ++-- .../certapply/applicators/sp_jdcloud_dns.go | 10 ++-- internal/certapply/applicators/sp_local.go | 2 +- .../certapply/applicators/sp_namecheap.go | 8 ++-- .../certapply/applicators/sp_namedotcom.go | 8 ++-- internal/certapply/applicators/sp_namesilo.go | 6 +-- internal/certapply/applicators/sp_netcup.go | 10 ++-- internal/certapply/applicators/sp_netlify.go | 6 +-- internal/certapply/applicators/sp_ns1.go | 6 +-- internal/certapply/applicators/sp_porkbun.go | 8 ++-- internal/certapply/applicators/sp_powerdns.go | 10 ++-- internal/certapply/applicators/sp_rainyun.go | 6 +-- .../certapply/applicators/sp_spaceship.go | 8 ++-- .../applicators/sp_tencentcloud_dns.go | 8 ++-- .../applicators/sp_tencentcloud_eo.go | 10 ++-- .../certapply/applicators/sp_ucloud_udnr.go | 8 ++-- internal/certapply/applicators/sp_vercel.go | 8 ++-- .../applicators/sp_volcengine_dns.go | 8 ++-- internal/certapply/applicators/sp_westcn.go | 8 ++-- internal/certdeploy/deployers/registry.go | 4 +- .../certdeploy/deployers/sp_1panel_console.go | 14 +++--- .../certdeploy/deployers/sp_1panel_site.go | 20 ++++---- .../certdeploy/deployers/sp_aliyun_alb.go | 20 ++++---- .../certdeploy/deployers/sp_aliyun_apigw.go | 20 ++++---- .../certdeploy/deployers/sp_aliyun_cas.go | 12 ++--- .../deployers/sp_aliyun_casdeploy.go | 16 +++---- .../certdeploy/deployers/sp_aliyun_cdn.go | 12 ++--- .../certdeploy/deployers/sp_aliyun_clb.go | 20 ++++---- .../certdeploy/deployers/sp_aliyun_ddos.go | 14 +++--- .../certdeploy/deployers/sp_aliyun_esa.go | 12 ++--- internal/certdeploy/deployers/sp_aliyun_fc.go | 16 +++---- internal/certdeploy/deployers/sp_aliyun_ga.go | 18 ++++---- .../certdeploy/deployers/sp_aliyun_live.go | 12 ++--- .../certdeploy/deployers/sp_aliyun_nlb.go | 18 ++++---- .../certdeploy/deployers/sp_aliyun_oss.go | 16 +++---- .../certdeploy/deployers/sp_aliyun_vod.go | 14 +++--- .../certdeploy/deployers/sp_aliyun_waf.go | 18 ++++---- .../certdeploy/deployers/sp_aliyund_cdn.go | 12 ++--- internal/certdeploy/deployers/sp_apisix.go | 14 +++--- internal/certdeploy/deployers/sp_aws_acm.go | 12 ++--- .../certdeploy/deployers/sp_aws_cloudfront.go | 14 +++--- internal/certdeploy/deployers/sp_aws_iam.go | 12 ++--- .../certdeploy/deployers/sp_azure_keyvault.go | 16 +++---- .../deployers/sp_baiducloud_appblb.go | 18 ++++---- .../certdeploy/deployers/sp_baiducloud_blb.go | 18 ++++---- .../certdeploy/deployers/sp_baiducloud_cdn.go | 10 ++-- .../deployers/sp_baiducloud_cert.go | 8 ++-- .../certdeploy/deployers/sp_baishan_cdn.go | 10 ++-- .../deployers/sp_baotapanel_console.go | 12 ++--- .../deployers/sp_baotapanel_site.go | 16 +++---- .../deployers/sp_baotawaf_console.go | 10 ++-- .../certdeploy/deployers/sp_baotawaf_site.go | 14 +++--- internal/certdeploy/deployers/sp_bunny_cdn.go | 10 ++-- .../certdeploy/deployers/sp_byteplus_cdn.go | 10 ++-- internal/certdeploy/deployers/sp_cachefly.go | 6 +-- internal/certdeploy/deployers/sp_cdnfly.go | 18 ++++---- .../certdeploy/deployers/sp_ctcccloud_ao.go | 10 ++-- .../certdeploy/deployers/sp_ctcccloud_cdn.go | 10 ++-- .../certdeploy/deployers/sp_ctcccloud_cms.go | 8 ++-- .../certdeploy/deployers/sp_ctcccloud_elb.go | 16 +++---- .../certdeploy/deployers/sp_ctcccloud_icdn.go | 10 ++-- .../certdeploy/deployers/sp_ctcccloud_lvdn.go | 10 ++-- .../certdeploy/deployers/sp_dogecloud_cdn.go | 10 ++-- .../deployers/sp_edgio_applications.go | 10 ++-- internal/certdeploy/deployers/sp_flexcdn.go | 18 ++++---- internal/certdeploy/deployers/sp_gcore_cdn.go | 10 ++-- internal/certdeploy/deployers/sp_goedge.go | 18 ++++---- .../deployers/sp_huaweicloud_cdn.go | 14 +++--- .../deployers/sp_huaweicloud_elb.go | 20 ++++---- .../deployers/sp_huaweicloud_scm.go | 10 ++-- .../deployers/sp_huaweicloud_waf.go | 18 ++++---- .../certdeploy/deployers/sp_jdcloud_alb.go | 16 +++---- .../certdeploy/deployers/sp_jdcloud_cdn.go | 10 ++-- .../certdeploy/deployers/sp_jdcloud_live.go | 10 ++-- .../certdeploy/deployers/sp_jdcloud_vod.go | 10 ++-- internal/certdeploy/deployers/sp_kong.go | 16 +++---- .../deployers/sp_kubernetes_secret.go | 16 +++---- internal/certdeploy/deployers/sp_lecdn.go | 22 ++++----- internal/certdeploy/deployers/sp_local.go | 24 +++++----- .../certdeploy/deployers/sp_netlify_site.go | 8 ++-- internal/certdeploy/deployers/sp_proxmoxve.go | 16 +++---- internal/certdeploy/deployers/sp_qiniu_cdn.go | 10 ++-- .../certdeploy/deployers/sp_qiniu_kodo.go | 10 ++-- .../certdeploy/deployers/sp_qiniu_pili.go | 12 ++--- .../certdeploy/deployers/sp_rainyun_rcdn.go | 10 ++-- .../deployers/sp_ratpanel_console.go | 12 ++--- .../certdeploy/deployers/sp_ratpanel_site.go | 14 +++--- internal/certdeploy/deployers/sp_safeline.go | 14 +++--- internal/certdeploy/deployers/sp_ssh.go | 46 +++++++++---------- .../deployers/sp_tencentcloud_cdn.go | 12 ++--- .../deployers/sp_tencentcloud_clb.go | 20 ++++---- .../deployers/sp_tencentcloud_cos.go | 14 +++--- .../deployers/sp_tencentcloud_css.go | 12 ++--- .../deployers/sp_tencentcloud_ecdn.go | 12 ++--- .../deployers/sp_tencentcloud_eo.go | 14 +++--- .../deployers/sp_tencentcloud_gaap.go | 16 +++---- .../deployers/sp_tencentcloud_scf.go | 14 +++--- .../deployers/sp_tencentcloud_ssl.go | 10 ++-- .../deployers/sp_tencentcloud_ssldeploy.go | 16 +++---- .../deployers/sp_tencentcloud_sslupdate.go | 18 ++++---- .../deployers/sp_tencentcloud_vod.go | 14 +++--- .../deployers/sp_tencentcloud_waf.go | 16 +++---- .../certdeploy/deployers/sp_ucloud_ucdn.go | 12 ++--- .../certdeploy/deployers/sp_ucloud_us3.go | 16 +++---- .../deployers/sp_unicloud_webhost.go | 14 +++--- internal/certdeploy/deployers/sp_upyun_cdn.go | 10 ++-- .../certdeploy/deployers/sp_upyun_file.go | 10 ++-- .../certdeploy/deployers/sp_volcengine_alb.go | 18 ++++---- .../certdeploy/deployers/sp_volcengine_cdn.go | 10 ++-- .../deployers/sp_volcengine_certcenter.go | 10 ++-- .../certdeploy/deployers/sp_volcengine_clb.go | 16 +++---- .../deployers/sp_volcengine_dcdn.go | 10 ++-- .../deployers/sp_volcengine_imagex.go | 14 +++--- .../deployers/sp_volcengine_live.go | 10 ++-- .../certdeploy/deployers/sp_volcengine_tos.go | 14 +++--- .../certdeploy/deployers/sp_wangsu_cdn.go | 10 ++-- .../certdeploy/deployers/sp_wangsu_cdnpro.go | 18 ++++---- .../deployers/sp_wangsu_certificate.go | 10 ++-- internal/certdeploy/deployers/sp_webhook.go | 16 +++---- internal/deployer/deployer.go | 6 +-- internal/deployer/providers.go | 10 ++-- internal/notify/notifier.go | 6 +-- internal/notify/notifiers/registry.go | 4 +- internal/notify/notifiers/sp_dingtalkbot.go | 8 ++-- internal/notify/notifiers/sp_discordbot.go | 8 ++-- internal/notify/notifiers/sp_email.go | 20 ++++---- internal/notify/notifiers/sp_larkbot.go | 6 +-- internal/notify/notifiers/sp_mattermost.go | 12 ++--- internal/notify/notifiers/sp_slackbot.go | 8 ++-- internal/notify/notifiers/sp_telegrambot.go | 8 ++-- internal/notify/notifiers/sp_webhook.go | 16 +++---- internal/notify/notifiers/sp_wecombot.go | 6 +-- internal/notify/providers.go | 10 ++-- 156 files changed, 927 insertions(+), 927 deletions(-) diff --git a/internal/applicant/providers.go b/internal/applicant/providers.go index 0825009c7..e1a2a0fd6 100644 --- a/internal/applicant/providers.go +++ b/internal/applicant/providers.go @@ -35,10 +35,10 @@ func createApplicantProvider(options *applicantProviderOptions) (challenge.Provi } return provider(&applicators.ProviderFactoryOptions{ - AccessConfig: options.ProviderAccessConfig, - ProviderConfig: options.ProviderServiceConfig, - DnsPropagationWait: options.DnsPropagationWait, - DnsPropagationTimeout: options.DnsPropagationTimeout, - DnsTTL: options.DnsTTL, + ProviderAccessConfig: options.ProviderAccessConfig, + ProviderExtendedConfig: options.ProviderServiceConfig, + DnsPropagationWait: options.DnsPropagationWait, + DnsPropagationTimeout: options.DnsPropagationTimeout, + DnsTTL: options.DnsTTL, }) } diff --git a/internal/certapply/applicators/registry.go b/internal/certapply/applicators/registry.go index 1122efa03..9e871bbd9 100644 --- a/internal/certapply/applicators/registry.go +++ b/internal/certapply/applicators/registry.go @@ -10,11 +10,11 @@ import ( type ProviderFactoryFunc func(options *ProviderFactoryOptions) (core.ACMEChallenger, error) type ProviderFactoryOptions struct { - AccessConfig map[string]any - ProviderConfig map[string]any - DnsPropagationWait int32 - DnsPropagationTimeout int32 - DnsTTL int32 + ProviderAccessConfig map[string]any + ProviderExtendedConfig map[string]any + DnsPropagationWait int32 + DnsPropagationTimeout int32 + DnsTTL int32 } type Registry[T comparable] interface { diff --git a/internal/certapply/applicators/sp_acmehttpreq.go b/internal/certapply/applicators/sp_acmehttpreq.go index b81d635b3..fbf90c818 100644 --- a/internal/certapply/applicators/sp_acmehttpreq.go +++ b/internal/certapply/applicators/sp_acmehttpreq.go @@ -12,16 +12,16 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeACMEHttpReq, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForACMEHttpReq{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForACMEHttpReq{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := acmehttpreq.NewChallengeProvider(&acmehttpreq.ChallengeProviderConfig{ - Endpoint: access.Endpoint, - Mode: access.Mode, - Username: access.Username, - Password: access.Password, + Endpoint: credentials.Endpoint, + Mode: credentials.Mode, + Username: credentials.Username, + Password: credentials.Password, DnsPropagationTimeout: options.DnsPropagationTimeout, }) return provider, err diff --git a/internal/certapply/applicators/sp_aliyun_dns.go b/internal/certapply/applicators/sp_aliyun_dns.go index 071433b4a..9becef613 100644 --- a/internal/certapply/applicators/sp_aliyun_dns.go +++ b/internal/certapply/applicators/sp_aliyun_dns.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeAliyunDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyun.NewChallengeProvider(&aliyun.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_aliyun_esa.go b/internal/certapply/applicators/sp_aliyun_esa.go index 584255abc..d1e7cbc6c 100644 --- a/internal/certapply/applicators/sp_aliyun_esa.go +++ b/internal/certapply/applicators/sp_aliyun_esa.go @@ -12,15 +12,15 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeAliyunESA, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunesa.NewChallengeProvider(&aliyunesa.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - Region: xmaps.GetString(options.ProviderConfig, "region"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_aws_route53.go b/internal/certapply/applicators/sp_aws_route53.go index 213243171..5a194e6ce 100644 --- a/internal/certapply/applicators/sp_aws_route53.go +++ b/internal/certapply/applicators/sp_aws_route53.go @@ -12,16 +12,16 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeAWSRoute53, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForAWS{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAWS{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := awsroute53.NewChallengeProvider(&awsroute53.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - HostedZoneId: xmaps.GetString(options.ProviderConfig, "hostedZoneId"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + HostedZoneId: xmaps.GetString(options.ProviderExtendedConfig, "hostedZoneId"), DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_azure_dns.go b/internal/certapply/applicators/sp_azure_dns.go index 7825f0e0c..5c89d6ba1 100644 --- a/internal/certapply/applicators/sp_azure_dns.go +++ b/internal/certapply/applicators/sp_azure_dns.go @@ -12,16 +12,16 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeAzureDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForAzure{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAzure{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := azuredns.NewChallengeProvider(&azuredns.ChallengeProviderConfig{ - TenantId: access.TenantId, - ClientId: access.ClientId, - ClientSecret: access.ClientSecret, - CloudName: access.CloudName, + TenantId: credentials.TenantId, + ClientId: credentials.ClientId, + ClientSecret: credentials.ClientSecret, + CloudName: credentials.CloudName, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_baiducloud_dns.go b/internal/certapply/applicators/sp_baiducloud_dns.go index 4e4bab225..4574ea46c 100644 --- a/internal/certapply/applicators/sp_baiducloud_dns.go +++ b/internal/certapply/applicators/sp_baiducloud_dns.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeBaiduCloudDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForBaiduCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaiduCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baiducloud.NewChallengeProvider(&baiducloud.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_bunny.go b/internal/certapply/applicators/sp_bunny.go index 18773aed4..b886d4c0c 100644 --- a/internal/certapply/applicators/sp_bunny.go +++ b/internal/certapply/applicators/sp_bunny.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeBunny, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForBunny{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBunny{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := bunny.NewChallengeProvider(&bunny.ChallengeProviderConfig{ - ApiKey: access.ApiKey, + ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_cloudflare.go b/internal/certapply/applicators/sp_cloudflare.go index 38c7aea09..a08cf388c 100644 --- a/internal/certapply/applicators/sp_cloudflare.go +++ b/internal/certapply/applicators/sp_cloudflare.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeCloudflare, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForCloudflare{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCloudflare{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := cloudflare.NewChallengeProvider(&cloudflare.ChallengeProviderConfig{ - DnsApiToken: access.DnsApiToken, - ZoneApiToken: access.ZoneApiToken, + DnsApiToken: credentials.DnsApiToken, + ZoneApiToken: credentials.ZoneApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_cloudns.go b/internal/certapply/applicators/sp_cloudns.go index 165ef23f3..c9f5977d7 100644 --- a/internal/certapply/applicators/sp_cloudns.go +++ b/internal/certapply/applicators/sp_cloudns.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeClouDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForClouDNS{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForClouDNS{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := cloudns.NewChallengeProvider(&cloudns.ChallengeProviderConfig{ - AuthId: access.AuthId, - AuthPassword: access.AuthPassword, + AuthId: credentials.AuthId, + AuthPassword: credentials.AuthPassword, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_cmcccloud_dns.go b/internal/certapply/applicators/sp_cmcccloud_dns.go index 936bb535e..30a654992 100644 --- a/internal/certapply/applicators/sp_cmcccloud_dns.go +++ b/internal/certapply/applicators/sp_cmcccloud_dns.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeCMCCCloudDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForCMCCCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCMCCCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := cmcccloud.NewChallengeProvider(&cmcccloud.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_constellix.go b/internal/certapply/applicators/sp_constellix.go index ef48791f6..a73920631 100644 --- a/internal/certapply/applicators/sp_constellix.go +++ b/internal/certapply/applicators/sp_constellix.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeConstellix, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForConstellix{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForConstellix{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := constellix.NewChallengeProvider(&constellix.ChallengeProviderConfig{ - ApiKey: access.ApiKey, - SecretKey: access.SecretKey, + ApiKey: credentials.ApiKey, + SecretKey: credentials.SecretKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_ctcccloud_smartdns.go b/internal/certapply/applicators/sp_ctcccloud_smartdns.go index c328d51f1..3881d4dbe 100644 --- a/internal/certapply/applicators/sp_ctcccloud_smartdns.go +++ b/internal/certapply/applicators/sp_ctcccloud_smartdns.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeCTCCCloudSmartDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForCTCCCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCTCCCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ctcccloud.NewChallengeProvider(&ctcccloud.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_desec.go b/internal/certapply/applicators/sp_desec.go index 8836f8106..b5403ac30 100644 --- a/internal/certapply/applicators/sp_desec.go +++ b/internal/certapply/applicators/sp_desec.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeDeSEC, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForDeSEC{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForDeSEC{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := desec.NewChallengeProvider(&desec.ChallengeProviderConfig{ - Token: access.Token, + Token: credentials.Token, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_digitalocean.go b/internal/certapply/applicators/sp_digitalocean.go index 4a79278bf..4d178ad02 100644 --- a/internal/certapply/applicators/sp_digitalocean.go +++ b/internal/certapply/applicators/sp_digitalocean.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeDigitalOcean, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForDigitalOcean{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForDigitalOcean{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := digitalocean.NewChallengeProvider(&digitalocean.ChallengeProviderConfig{ - AccessToken: access.AccessToken, + AccessToken: credentials.AccessToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_dnsla.go b/internal/certapply/applicators/sp_dnsla.go index 3d5a03d51..dcd8b9c57 100644 --- a/internal/certapply/applicators/sp_dnsla.go +++ b/internal/certapply/applicators/sp_dnsla.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeDNSLA, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForDNSLA{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForDNSLA{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := dnsla.NewChallengeProvider(&dnsla.ChallengeProviderConfig{ - ApiId: access.ApiId, - ApiSecret: access.ApiSecret, + ApiId: credentials.ApiId, + ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_duckdns.go b/internal/certapply/applicators/sp_duckdns.go index 916d89173..91f3a9a61 100644 --- a/internal/certapply/applicators/sp_duckdns.go +++ b/internal/certapply/applicators/sp_duckdns.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeDuckDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForDuckDNS{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForDuckDNS{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := duckdns.NewChallengeProvider(&duckdns.ChallengeProviderConfig{ - Token: access.Token, + Token: credentials.Token, DnsPropagationTimeout: options.DnsPropagationTimeout, }) return provider, err diff --git a/internal/certapply/applicators/sp_dynv6.go b/internal/certapply/applicators/sp_dynv6.go index 074f22070..55a007076 100644 --- a/internal/certapply/applicators/sp_dynv6.go +++ b/internal/certapply/applicators/sp_dynv6.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeDynv6, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForDynv6{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForDynv6{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := dynv6.NewChallengeProvider(&dynv6.ChallengeProviderConfig{ - HttpToken: access.HttpToken, + HttpToken: credentials.HttpToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_gcore.go b/internal/certapply/applicators/sp_gcore.go index 3ab4d6083..bd36ce556 100644 --- a/internal/certapply/applicators/sp_gcore.go +++ b/internal/certapply/applicators/sp_gcore.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeGcore, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForGcore{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForGcore{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := gcore.NewChallengeProvider(&gcore.ChallengeProviderConfig{ - ApiToken: access.ApiToken, + ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_gname.go b/internal/certapply/applicators/sp_gname.go index a6c600c9a..6e05c8fdd 100644 --- a/internal/certapply/applicators/sp_gname.go +++ b/internal/certapply/applicators/sp_gname.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeGname, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForGname{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForGname{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := gname.NewChallengeProvider(&gname.ChallengeProviderConfig{ - AppId: access.AppId, - AppKey: access.AppKey, + AppId: credentials.AppId, + AppKey: credentials.AppKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_godaddy.go b/internal/certapply/applicators/sp_godaddy.go index cc02fda53..299e8a5b0 100644 --- a/internal/certapply/applicators/sp_godaddy.go +++ b/internal/certapply/applicators/sp_godaddy.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeGoDaddy, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForGoDaddy{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForGoDaddy{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := godaddy.NewChallengeProvider(&godaddy.ChallengeProviderConfig{ - ApiKey: access.ApiKey, - ApiSecret: access.ApiSecret, + ApiKey: credentials.ApiKey, + ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_hetzner.go b/internal/certapply/applicators/sp_hetzner.go index 578345ed8..89ec83e60 100644 --- a/internal/certapply/applicators/sp_hetzner.go +++ b/internal/certapply/applicators/sp_hetzner.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeHetzner, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForHetzner{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForHetzner{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := hetzner.NewChallengeProvider(&hetzner.ChallengeProviderConfig{ - ApiToken: access.ApiToken, + ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_huaweicloud_dns.go b/internal/certapply/applicators/sp_huaweicloud_dns.go index d742f3883..8ba1ef67e 100644 --- a/internal/certapply/applicators/sp_huaweicloud_dns.go +++ b/internal/certapply/applicators/sp_huaweicloud_dns.go @@ -12,15 +12,15 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeHuaweiCloudDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForHuaweiCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForHuaweiCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := huaweicloud.NewChallengeProvider(&huaweicloud.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_jdcloud_dns.go b/internal/certapply/applicators/sp_jdcloud_dns.go index 0a3b1bd03..8db2eb806 100644 --- a/internal/certapply/applicators/sp_jdcloud_dns.go +++ b/internal/certapply/applicators/sp_jdcloud_dns.go @@ -12,15 +12,15 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeJDCloudDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForJDCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForJDCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := jdcloud.NewChallengeProvider(&jdcloud.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - RegionId: xmaps.GetString(options.ProviderConfig, "regionId"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_local.go b/internal/certapply/applicators/sp_local.go index bf34f7d9e..b467b00c0 100644 --- a/internal/certapply/applicators/sp_local.go +++ b/internal/certapply/applicators/sp_local.go @@ -11,7 +11,7 @@ import ( func init() { if err := ACMEHttp01Registries.Register(domain.ACMEHttp01ProviderTypeLocal, func(options *ProviderFactoryOptions) (challenge.Provider, error) { provider, err := local.NewChallengeProvider(&local.ChallengeProviderConfig{ - WebRootPath: xmaps.GetString(options.ProviderConfig, "webRootPath"), + WebRootPath: xmaps.GetString(options.ProviderExtendedConfig, "webRootPath"), }) return provider, err }); err != nil { diff --git a/internal/certapply/applicators/sp_namecheap.go b/internal/certapply/applicators/sp_namecheap.go index a130036b5..3eb94fdf4 100644 --- a/internal/certapply/applicators/sp_namecheap.go +++ b/internal/certapply/applicators/sp_namecheap.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeNamecheap, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForNamecheap{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForNamecheap{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := namecheap.NewChallengeProvider(&namecheap.ChallengeProviderConfig{ - Username: access.Username, - ApiKey: access.ApiKey, + Username: credentials.Username, + ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_namedotcom.go b/internal/certapply/applicators/sp_namedotcom.go index 897f766c1..72123d077 100644 --- a/internal/certapply/applicators/sp_namedotcom.go +++ b/internal/certapply/applicators/sp_namedotcom.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeNameDotCom, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForNameDotCom{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForNameDotCom{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := namedotcom.NewChallengeProvider(&namedotcom.ChallengeProviderConfig{ - Username: access.Username, - ApiToken: access.ApiToken, + Username: credentials.Username, + ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_namesilo.go b/internal/certapply/applicators/sp_namesilo.go index cf21b7094..95ef52629 100644 --- a/internal/certapply/applicators/sp_namesilo.go +++ b/internal/certapply/applicators/sp_namesilo.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeNameSilo, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForNameSilo{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForNameSilo{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := namesilo.NewChallengeProvider(&namesilo.ChallengeProviderConfig{ - ApiKey: access.ApiKey, + ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_netcup.go b/internal/certapply/applicators/sp_netcup.go index eb5e3b82c..8f6698c2c 100644 --- a/internal/certapply/applicators/sp_netcup.go +++ b/internal/certapply/applicators/sp_netcup.go @@ -12,15 +12,15 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeNetcup, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForNetcup{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForNetcup{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := netcup.NewChallengeProvider(&netcup.ChallengeProviderConfig{ - CustomerNumber: access.CustomerNumber, - ApiKey: access.ApiKey, - ApiPassword: access.ApiPassword, + CustomerNumber: credentials.CustomerNumber, + ApiKey: credentials.ApiKey, + ApiPassword: credentials.ApiPassword, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_netlify.go b/internal/certapply/applicators/sp_netlify.go index 9e4b4dc64..c9e7b0234 100644 --- a/internal/certapply/applicators/sp_netlify.go +++ b/internal/certapply/applicators/sp_netlify.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeNetlify, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForNetlify{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForNetlify{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := netlify.NewChallengeProvider(&netlify.ChallengeProviderConfig{ - ApiToken: access.ApiToken, + ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_ns1.go b/internal/certapply/applicators/sp_ns1.go index 7555581ae..14915420e 100644 --- a/internal/certapply/applicators/sp_ns1.go +++ b/internal/certapply/applicators/sp_ns1.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeNS1, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForNS1{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForNS1{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ns1.NewChallengeProvider(&ns1.ChallengeProviderConfig{ - ApiKey: access.ApiKey, + ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_porkbun.go b/internal/certapply/applicators/sp_porkbun.go index 2f192b8d1..4910d194b 100644 --- a/internal/certapply/applicators/sp_porkbun.go +++ b/internal/certapply/applicators/sp_porkbun.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypePorkbun, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForPorkbun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForPorkbun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := porkbun.NewChallengeProvider(&porkbun.ChallengeProviderConfig{ - ApiKey: access.ApiKey, - SecretApiKey: access.SecretApiKey, + ApiKey: credentials.ApiKey, + SecretApiKey: credentials.SecretApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_powerdns.go b/internal/certapply/applicators/sp_powerdns.go index ab1204c60..43c8f5547 100644 --- a/internal/certapply/applicators/sp_powerdns.go +++ b/internal/certapply/applicators/sp_powerdns.go @@ -12,15 +12,15 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypePowerDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForPowerDNS{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForPowerDNS{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := powerdns.NewChallengeProvider(&powerdns.ChallengeProviderConfig{ - ServerUrl: access.ServerUrl, - ApiKey: access.ApiKey, - AllowInsecureConnections: access.AllowInsecureConnections, + ServerUrl: credentials.ServerUrl, + ApiKey: credentials.ApiKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_rainyun.go b/internal/certapply/applicators/sp_rainyun.go index e891942a7..88e6a2bee 100644 --- a/internal/certapply/applicators/sp_rainyun.go +++ b/internal/certapply/applicators/sp_rainyun.go @@ -12,13 +12,13 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeRainYun, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForRainYun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForRainYun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := rainyun.NewChallengeProvider(&rainyun.ChallengeProviderConfig{ - ApiKey: access.ApiKey, + ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_spaceship.go b/internal/certapply/applicators/sp_spaceship.go index 2117333a9..0734c31e4 100644 --- a/internal/certapply/applicators/sp_spaceship.go +++ b/internal/certapply/applicators/sp_spaceship.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeSpaceship, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForSpaceship{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForSpaceship{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := spaceship.NewChallengeProvider(&spaceship.ChallengeProviderConfig{ - ApiKey: access.ApiKey, - ApiSecret: access.ApiSecret, + ApiKey: credentials.ApiKey, + ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_tencentcloud_dns.go b/internal/certapply/applicators/sp_tencentcloud_dns.go index 88470e2c0..878b14ee4 100644 --- a/internal/certapply/applicators/sp_tencentcloud_dns.go +++ b/internal/certapply/applicators/sp_tencentcloud_dns.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeTencentCloudDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloud.NewChallengeProvider(&tencentcloud.ChallengeProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_tencentcloud_eo.go b/internal/certapply/applicators/sp_tencentcloud_eo.go index 78fab0de4..867b37d18 100644 --- a/internal/certapply/applicators/sp_tencentcloud_eo.go +++ b/internal/certapply/applicators/sp_tencentcloud_eo.go @@ -12,15 +12,15 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeTencentCloudEO, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := teo.NewChallengeProvider(&teo.ChallengeProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - ZoneId: xmaps.GetString(options.ProviderConfig, "zoneId"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + ZoneId: xmaps.GetString(options.ProviderExtendedConfig, "zoneId"), DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_ucloud_udnr.go b/internal/certapply/applicators/sp_ucloud_udnr.go index e3bb4730e..74406df65 100644 --- a/internal/certapply/applicators/sp_ucloud_udnr.go +++ b/internal/certapply/applicators/sp_ucloud_udnr.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeUCloudUDNR, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForUCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForUCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := udnr.NewChallengeProvider(&udnr.ChallengeProviderConfig{ - PrivateKey: access.PrivateKey, - PublicKey: access.PublicKey, + PrivateKey: credentials.PrivateKey, + PublicKey: credentials.PublicKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_vercel.go b/internal/certapply/applicators/sp_vercel.go index b3796008a..ed8532f13 100644 --- a/internal/certapply/applicators/sp_vercel.go +++ b/internal/certapply/applicators/sp_vercel.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeVercel, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForVercel{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVercel{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := vercel.NewChallengeProvider(&vercel.ChallengeProviderConfig{ - ApiAccessToken: access.ApiAccessToken, - TeamId: access.TeamId, + ApiAccessToken: credentials.ApiAccessToken, + TeamId: credentials.TeamId, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_volcengine_dns.go b/internal/certapply/applicators/sp_volcengine_dns.go index 02f411449..d34a538bb 100644 --- a/internal/certapply/applicators/sp_volcengine_dns.go +++ b/internal/certapply/applicators/sp_volcengine_dns.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeVolcEngineDNS, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcengine.NewChallengeProvider(&volcengine.ChallengeProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certapply/applicators/sp_westcn.go b/internal/certapply/applicators/sp_westcn.go index 2931e9e0e..b3ea5baef 100644 --- a/internal/certapply/applicators/sp_westcn.go +++ b/internal/certapply/applicators/sp_westcn.go @@ -12,14 +12,14 @@ import ( func init() { if err := ACMEDns01Registries.Register(domain.ACMEDns01ProviderTypeWestcn, func(options *ProviderFactoryOptions) (challenge.Provider, error) { - access := domain.AccessConfigForWestcn{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForWestcn{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := westcn.NewChallengeProvider(&westcn.ChallengeProviderConfig{ - Username: access.Username, - ApiPassword: access.ApiPassword, + Username: credentials.Username, + ApiPassword: credentials.ApiPassword, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, }) diff --git a/internal/certdeploy/deployers/registry.go b/internal/certdeploy/deployers/registry.go index 8d393a71f..a678d3ff2 100644 --- a/internal/certdeploy/deployers/registry.go +++ b/internal/certdeploy/deployers/registry.go @@ -10,8 +10,8 @@ import ( type ProviderFactoryFunc func(options *ProviderFactoryOptions) (core.SSLDeployer, error) type ProviderFactoryOptions struct { - AccessConfig map[string]any - ProviderConfig map[string]any + ProviderAccessConfig map[string]any + ProviderExtendedConfig map[string]any } type Registry[T comparable] interface { diff --git a/internal/certdeploy/deployers/sp_1panel_console.go b/internal/certdeploy/deployers/sp_1panel_console.go index 4ff770c22..898d6178c 100644 --- a/internal/certdeploy/deployers/sp_1panel_console.go +++ b/internal/certdeploy/deployers/sp_1panel_console.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderType1PanelConsole, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigFor1Panel{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigFor1Panel{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := opconsole.NewSSLDeployerProvider(&opconsole.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiVersion: access.ApiVersion, - ApiKey: access.ApiKey, - AllowInsecureConnections: access.AllowInsecureConnections, - AutoRestart: xmaps.GetBool(options.ProviderConfig, "autoRestart"), + ServerUrl: credentials.ServerUrl, + ApiVersion: credentials.ApiVersion, + ApiKey: credentials.ApiKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, + AutoRestart: xmaps.GetBool(options.ProviderExtendedConfig, "autoRestart"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_1panel_site.go b/internal/certdeploy/deployers/sp_1panel_site.go index c4ca98a99..145fefc1e 100644 --- a/internal/certdeploy/deployers/sp_1panel_site.go +++ b/internal/certdeploy/deployers/sp_1panel_site.go @@ -11,20 +11,20 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderType1PanelSite, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigFor1Panel{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigFor1Panel{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := opsite.NewSSLDeployerProvider(&opsite.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiVersion: access.ApiVersion, - ApiKey: access.ApiKey, - AllowInsecureConnections: access.AllowInsecureConnections, - NodeName: xmaps.GetString(options.ProviderConfig, "nodeName"), - ResourceType: opsite.ResourceType(xmaps.GetOrDefaultString(options.ProviderConfig, "resourceType", string(opsite.RESOURCE_TYPE_WEBSITE))), - WebsiteId: xmaps.GetInt64(options.ProviderConfig, "websiteId"), - CertificateId: xmaps.GetInt64(options.ProviderConfig, "certificateId"), + ServerUrl: credentials.ServerUrl, + ApiVersion: credentials.ApiVersion, + ApiKey: credentials.ApiKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, + NodeName: xmaps.GetString(options.ProviderExtendedConfig, "nodeName"), + ResourceType: opsite.ResourceType(xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "resourceType", string(opsite.RESOURCE_TYPE_WEBSITE))), + WebsiteId: xmaps.GetInt64(options.ProviderExtendedConfig, "websiteId"), + CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_alb.go b/internal/certdeploy/deployers/sp_aliyun_alb.go index e1f687a0c..b2bc34019 100644 --- a/internal/certdeploy/deployers/sp_aliyun_alb.go +++ b/internal/certdeploy/deployers/sp_aliyun_alb.go @@ -11,20 +11,20 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunALB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunalb.NewSSLDeployerProvider(&aliyunalb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: aliyunalb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: aliyunalb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_apigw.go b/internal/certdeploy/deployers/sp_aliyun_apigw.go index 580db151f..30eb6b29c 100644 --- a/internal/certdeploy/deployers/sp_aliyun_apigw.go +++ b/internal/certdeploy/deployers/sp_aliyun_apigw.go @@ -11,20 +11,20 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunAPIGW, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunapigw.NewSSLDeployerProvider(&aliyunapigw.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ServiceType: aliyunapigw.ServiceType(xmaps.GetString(options.ProviderConfig, "serviceType")), - GatewayId: xmaps.GetString(options.ProviderConfig, "gatewayId"), - GroupId: xmaps.GetString(options.ProviderConfig, "groupId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ServiceType: aliyunapigw.ServiceType(xmaps.GetString(options.ProviderExtendedConfig, "serviceType")), + GatewayId: xmaps.GetString(options.ProviderExtendedConfig, "gatewayId"), + GroupId: xmaps.GetString(options.ProviderExtendedConfig, "groupId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_cas.go b/internal/certdeploy/deployers/sp_aliyun_cas.go index 877b34c4c..c909978ee 100644 --- a/internal/certdeploy/deployers/sp_aliyun_cas.go +++ b/internal/certdeploy/deployers/sp_aliyun_cas.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunCAS, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyuncas.NewSSLDeployerProvider(&aliyuncas.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_casdeploy.go b/internal/certdeploy/deployers/sp_aliyun_casdeploy.go index d2bc0cb01..57c022823 100644 --- a/internal/certdeploy/deployers/sp_aliyun_casdeploy.go +++ b/internal/certdeploy/deployers/sp_aliyun_casdeploy.go @@ -14,18 +14,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunCASDeploy, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyuncasdeploy.NewSSLDeployerProvider(&aliyuncasdeploy.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceIds: lo.Filter(strings.Split(xmaps.GetString(options.ProviderConfig, "resourceIds"), ";"), func(s string, _ int) bool { return s != "" }), - ContactIds: lo.Filter(strings.Split(xmaps.GetString(options.ProviderConfig, "contactIds"), ";"), func(s string, _ int) bool { return s != "" }), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceIds: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "resourceIds"), ";"), func(s string, _ int) bool { return s != "" }), + ContactIds: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "contactIds"), ";"), func(s string, _ int) bool { return s != "" }), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_cdn.go b/internal/certdeploy/deployers/sp_aliyun_cdn.go index 2ba63cf0e..cd446f506 100644 --- a/internal/certdeploy/deployers/sp_aliyun_cdn.go +++ b/internal/certdeploy/deployers/sp_aliyun_cdn.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyuncdn.NewSSLDeployerProvider(&aliyuncdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_clb.go b/internal/certdeploy/deployers/sp_aliyun_clb.go index 9600b876d..b642e5066 100644 --- a/internal/certdeploy/deployers/sp_aliyun_clb.go +++ b/internal/certdeploy/deployers/sp_aliyun_clb.go @@ -11,20 +11,20 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunCLB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunclb.NewSSLDeployerProvider(&aliyunclb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: aliyunclb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerPort: xmaps.GetOrDefaultInt32(options.ProviderConfig, "listenerPort", 443), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: aliyunclb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerPort: xmaps.GetOrDefaultInt32(options.ProviderExtendedConfig, "listenerPort", 443), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_ddos.go b/internal/certdeploy/deployers/sp_aliyun_ddos.go index d0b8c4cba..2c637a293 100644 --- a/internal/certdeploy/deployers/sp_aliyun_ddos.go +++ b/internal/certdeploy/deployers/sp_aliyun_ddos.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunDDoS, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunddos.NewSSLDeployerProvider(&aliyunddos.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_esa.go b/internal/certdeploy/deployers/sp_aliyun_esa.go index 4a8fb0a2f..1645ef75b 100644 --- a/internal/certdeploy/deployers/sp_aliyun_esa.go +++ b/internal/certdeploy/deployers/sp_aliyun_esa.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunESA, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunesa.NewSSLDeployerProvider(&aliyunesa.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - Region: xmaps.GetString(options.ProviderConfig, "region"), - SiteId: xmaps.GetInt64(options.ProviderConfig, "siteId"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + SiteId: xmaps.GetInt64(options.ProviderExtendedConfig, "siteId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_fc.go b/internal/certdeploy/deployers/sp_aliyun_fc.go index b8ea093c7..1d8514536 100644 --- a/internal/certdeploy/deployers/sp_aliyun_fc.go +++ b/internal/certdeploy/deployers/sp_aliyun_fc.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunFC, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunfc.NewSSLDeployerProvider(&aliyunfc.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ServiceVersion: xmaps.GetOrDefaultString(options.ProviderConfig, "serviceVersion", "3.0"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ServiceVersion: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "serviceVersion", "3.0"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_ga.go b/internal/certdeploy/deployers/sp_aliyun_ga.go index 5b83926c8..ef7fbd34b 100644 --- a/internal/certdeploy/deployers/sp_aliyun_ga.go +++ b/internal/certdeploy/deployers/sp_aliyun_ga.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunGA, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunga.NewSSLDeployerProvider(&aliyunga.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - ResourceType: aliyunga.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - AcceleratorId: xmaps.GetString(options.ProviderConfig, "acceleratorId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + ResourceType: aliyunga.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + AcceleratorId: xmaps.GetString(options.ProviderExtendedConfig, "acceleratorId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_live.go b/internal/certdeploy/deployers/sp_aliyun_live.go index 1c2d1ebeb..71d3765f2 100644 --- a/internal/certdeploy/deployers/sp_aliyun_live.go +++ b/internal/certdeploy/deployers/sp_aliyun_live.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunLive, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunlive.NewSSLDeployerProvider(&aliyunlive.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - Region: xmaps.GetString(options.ProviderConfig, "region"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_nlb.go b/internal/certdeploy/deployers/sp_aliyun_nlb.go index ff0c75b1f..5985754ba 100644 --- a/internal/certdeploy/deployers/sp_aliyun_nlb.go +++ b/internal/certdeploy/deployers/sp_aliyun_nlb.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunNLB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunnlb.NewSSLDeployerProvider(&aliyunnlb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: aliyunnlb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: aliyunnlb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_oss.go b/internal/certdeploy/deployers/sp_aliyun_oss.go index 10dbc2213..57d502e4b 100644 --- a/internal/certdeploy/deployers/sp_aliyun_oss.go +++ b/internal/certdeploy/deployers/sp_aliyun_oss.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunOSS, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunoss.NewSSLDeployerProvider(&aliyunoss.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - Bucket: xmaps.GetString(options.ProviderConfig, "bucket"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_vod.go b/internal/certdeploy/deployers/sp_aliyun_vod.go index c957fbb64..9c9c9b013 100644 --- a/internal/certdeploy/deployers/sp_aliyun_vod.go +++ b/internal/certdeploy/deployers/sp_aliyun_vod.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunVOD, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunvod.NewSSLDeployerProvider(&aliyunvod.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyun_waf.go b/internal/certdeploy/deployers/sp_aliyun_waf.go index 8a5d57f5e..25a01afd0 100644 --- a/internal/certdeploy/deployers/sp_aliyun_waf.go +++ b/internal/certdeploy/deployers/sp_aliyun_waf.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunWAF, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyunwaf.NewSSLDeployerProvider(&aliyunwaf.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ServiceVersion: xmaps.GetOrDefaultString(options.ProviderConfig, "serviceVersion", "3.0"), - InstanceId: xmaps.GetString(options.ProviderConfig, "instanceId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ServiceVersion: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "serviceVersion", "3.0"), + InstanceId: xmaps.GetString(options.ProviderExtendedConfig, "instanceId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aliyund_cdn.go b/internal/certdeploy/deployers/sp_aliyund_cdn.go index 0532251a4..2a8279b74 100644 --- a/internal/certdeploy/deployers/sp_aliyund_cdn.go +++ b/internal/certdeploy/deployers/sp_aliyund_cdn.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAliyunDCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAliyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAliyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := aliyundcdn.NewSSLDeployerProvider(&aliyundcdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ResourceGroupId: access.ResourceGroupId, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ResourceGroupId: credentials.ResourceGroupId, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_apisix.go b/internal/certdeploy/deployers/sp_apisix.go index e2f58c151..98e7f2014 100644 --- a/internal/certdeploy/deployers/sp_apisix.go +++ b/internal/certdeploy/deployers/sp_apisix.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAPISIX, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAPISIX{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAPISIX{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := apisix.NewSSLDeployerProvider(&apisix.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiKey: access.ApiKey, - AllowInsecureConnections: access.AllowInsecureConnections, - ResourceType: apisix.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), + ServerUrl: credentials.ServerUrl, + ApiKey: credentials.ApiKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, + ResourceType: apisix.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aws_acm.go b/internal/certdeploy/deployers/sp_aws_acm.go index 0bf8fb6cf..39fba1e31 100644 --- a/internal/certdeploy/deployers/sp_aws_acm.go +++ b/internal/certdeploy/deployers/sp_aws_acm.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAWSACM, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAWS{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAWS{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := awsacm.NewSSLDeployerProvider(&awsacm.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - CertificateArn: xmaps.GetString(options.ProviderConfig, "certificateArn"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + CertificateArn: xmaps.GetString(options.ProviderExtendedConfig, "certificateArn"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aws_cloudfront.go b/internal/certdeploy/deployers/sp_aws_cloudfront.go index 79be995fe..947a591bc 100644 --- a/internal/certdeploy/deployers/sp_aws_cloudfront.go +++ b/internal/certdeploy/deployers/sp_aws_cloudfront.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAWSCloudFront, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAWS{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAWS{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := awscloudfront.NewSSLDeployerProvider(&awscloudfront.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - DistributionId: xmaps.GetString(options.ProviderConfig, "distributionId"), - CertificateSource: xmaps.GetOrDefaultString(options.ProviderConfig, "certificateSource", "ACM"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + DistributionId: xmaps.GetString(options.ProviderExtendedConfig, "distributionId"), + CertificateSource: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "certificateSource", "ACM"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_aws_iam.go b/internal/certdeploy/deployers/sp_aws_iam.go index 946fab0d9..54f97e651 100644 --- a/internal/certdeploy/deployers/sp_aws_iam.go +++ b/internal/certdeploy/deployers/sp_aws_iam.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAWSIAM, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAWS{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAWS{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := awsiam.NewSSLDeployerProvider(&awsiam.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - CertificatePath: xmaps.GetOrDefaultString(options.ProviderConfig, "certificatePath", "/"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + CertificatePath: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "certificatePath", "/"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_azure_keyvault.go b/internal/certdeploy/deployers/sp_azure_keyvault.go index 123a11b4f..778e22052 100644 --- a/internal/certdeploy/deployers/sp_azure_keyvault.go +++ b/internal/certdeploy/deployers/sp_azure_keyvault.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeAzureKeyVault, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForAzure{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForAzure{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := azurekeyvault.NewSSLDeployerProvider(&azurekeyvault.SSLDeployerProviderConfig{ - TenantId: access.TenantId, - ClientId: access.ClientId, - ClientSecret: access.ClientSecret, - CloudName: access.CloudName, - KeyVaultName: xmaps.GetString(options.ProviderConfig, "keyvaultName"), - CertificateName: xmaps.GetString(options.ProviderConfig, "certificateName"), + TenantId: credentials.TenantId, + ClientId: credentials.ClientId, + ClientSecret: credentials.ClientSecret, + CloudName: credentials.CloudName, + KeyVaultName: xmaps.GetString(options.ProviderExtendedConfig, "keyvaultName"), + CertificateName: xmaps.GetString(options.ProviderExtendedConfig, "certificateName"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baiducloud_appblb.go b/internal/certdeploy/deployers/sp_baiducloud_appblb.go index 7fae33bee..efd4431f9 100644 --- a/internal/certdeploy/deployers/sp_baiducloud_appblb.go +++ b/internal/certdeploy/deployers/sp_baiducloud_appblb.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaiduCloudAppBLB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaiduCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaiduCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baiducloudappblb.NewSSLDeployerProvider(&baiducloudappblb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: baiducloudappblb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerPort: xmaps.GetInt32(options.ProviderConfig, "listenerPort"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: baiducloudappblb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerPort: xmaps.GetInt32(options.ProviderExtendedConfig, "listenerPort"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baiducloud_blb.go b/internal/certdeploy/deployers/sp_baiducloud_blb.go index 9e9ce2883..8d65b33e2 100644 --- a/internal/certdeploy/deployers/sp_baiducloud_blb.go +++ b/internal/certdeploy/deployers/sp_baiducloud_blb.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaiduCloudBLB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaiduCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaiduCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baiducloudblb.NewSSLDeployerProvider(&baiducloudblb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: baiducloudblb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerPort: xmaps.GetInt32(options.ProviderConfig, "listenerPort"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: baiducloudblb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerPort: xmaps.GetInt32(options.ProviderExtendedConfig, "listenerPort"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baiducloud_cdn.go b/internal/certdeploy/deployers/sp_baiducloud_cdn.go index 79d2269fd..4ac36fea0 100644 --- a/internal/certdeploy/deployers/sp_baiducloud_cdn.go +++ b/internal/certdeploy/deployers/sp_baiducloud_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaiduCloudCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaiduCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaiduCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baiducloudcdn.NewSSLDeployerProvider(&baiducloudcdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baiducloud_cert.go b/internal/certdeploy/deployers/sp_baiducloud_cert.go index 386c745aa..4667cdc3c 100644 --- a/internal/certdeploy/deployers/sp_baiducloud_cert.go +++ b/internal/certdeploy/deployers/sp_baiducloud_cert.go @@ -11,14 +11,14 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaiduCloudCert, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaiduCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaiduCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baiducloudcert.NewSSLDeployerProvider(&baiducloudcert.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baishan_cdn.go b/internal/certdeploy/deployers/sp_baishan_cdn.go index 2d334bcb1..e2a10753a 100644 --- a/internal/certdeploy/deployers/sp_baishan_cdn.go +++ b/internal/certdeploy/deployers/sp_baishan_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaishanCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaishan{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaishan{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baishancdn.NewSSLDeployerProvider(&baishancdn.SSLDeployerProviderConfig{ - ApiToken: access.ApiToken, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), + ApiToken: credentials.ApiToken, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baotapanel_console.go b/internal/certdeploy/deployers/sp_baotapanel_console.go index bbcc35cb6..cfe370360 100644 --- a/internal/certdeploy/deployers/sp_baotapanel_console.go +++ b/internal/certdeploy/deployers/sp_baotapanel_console.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaotaPanelConsole, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaotaPanel{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaotaPanel{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baotapanelconsole.NewSSLDeployerProvider(&baotapanelconsole.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiKey: access.ApiKey, - AllowInsecureConnections: access.AllowInsecureConnections, - AutoRestart: xmaps.GetBool(options.ProviderConfig, "autoRestart"), + ServerUrl: credentials.ServerUrl, + ApiKey: credentials.ApiKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, + AutoRestart: xmaps.GetBool(options.ProviderExtendedConfig, "autoRestart"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baotapanel_site.go b/internal/certdeploy/deployers/sp_baotapanel_site.go index c0b3c18bf..d3c26b8c0 100644 --- a/internal/certdeploy/deployers/sp_baotapanel_site.go +++ b/internal/certdeploy/deployers/sp_baotapanel_site.go @@ -14,18 +14,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaotaPanelSite, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaotaPanel{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaotaPanel{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baotapanelsite.NewSSLDeployerProvider(&baotapanelsite.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiKey: access.ApiKey, - AllowInsecureConnections: access.AllowInsecureConnections, - SiteType: xmaps.GetOrDefaultString(options.ProviderConfig, "siteType", "other"), - SiteName: xmaps.GetString(options.ProviderConfig, "siteName"), - SiteNames: lo.Filter(strings.Split(xmaps.GetString(options.ProviderConfig, "siteNames"), ";"), func(s string, _ int) bool { return s != "" }), + ServerUrl: credentials.ServerUrl, + ApiKey: credentials.ApiKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, + SiteType: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "siteType", "other"), + SiteName: xmaps.GetString(options.ProviderExtendedConfig, "siteName"), + SiteNames: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "siteNames"), ";"), func(s string, _ int) bool { return s != "" }), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baotawaf_console.go b/internal/certdeploy/deployers/sp_baotawaf_console.go index e6a11ccd6..46111f2f5 100644 --- a/internal/certdeploy/deployers/sp_baotawaf_console.go +++ b/internal/certdeploy/deployers/sp_baotawaf_console.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaotaWAFConsole, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaotaWAF{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaotaWAF{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baotawafconsole.NewSSLDeployerProvider(&baotawafconsole.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiKey: access.ApiKey, - AllowInsecureConnections: access.AllowInsecureConnections, + ServerUrl: credentials.ServerUrl, + ApiKey: credentials.ApiKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_baotawaf_site.go b/internal/certdeploy/deployers/sp_baotawaf_site.go index 5cf9bc8ff..49be01000 100644 --- a/internal/certdeploy/deployers/sp_baotawaf_site.go +++ b/internal/certdeploy/deployers/sp_baotawaf_site.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBaotaWAFSite, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBaotaWAF{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBaotaWAF{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := baotawafsite.NewSSLDeployerProvider(&baotawafsite.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiKey: access.ApiKey, - AllowInsecureConnections: access.AllowInsecureConnections, - SiteName: xmaps.GetString(options.ProviderConfig, "siteName"), - SitePort: xmaps.GetOrDefaultInt32(options.ProviderConfig, "sitePort", 443), + ServerUrl: credentials.ServerUrl, + ApiKey: credentials.ApiKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, + SiteName: xmaps.GetString(options.ProviderExtendedConfig, "siteName"), + SitePort: xmaps.GetOrDefaultInt32(options.ProviderExtendedConfig, "sitePort", 443), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_bunny_cdn.go b/internal/certdeploy/deployers/sp_bunny_cdn.go index 8040da386..e8f9a50d5 100644 --- a/internal/certdeploy/deployers/sp_bunny_cdn.go +++ b/internal/certdeploy/deployers/sp_bunny_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBunnyCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBunny{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBunny{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := bunnycdn.NewSSLDeployerProvider(&bunnycdn.SSLDeployerProviderConfig{ - ApiKey: access.ApiKey, - PullZoneId: xmaps.GetString(options.ProviderConfig, "pullZoneId"), - Hostname: xmaps.GetString(options.ProviderConfig, "hostname"), + ApiKey: credentials.ApiKey, + PullZoneId: xmaps.GetString(options.ProviderExtendedConfig, "pullZoneId"), + Hostname: xmaps.GetString(options.ProviderExtendedConfig, "hostname"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_byteplus_cdn.go b/internal/certdeploy/deployers/sp_byteplus_cdn.go index 167ed78c2..7268dbe8f 100644 --- a/internal/certdeploy/deployers/sp_byteplus_cdn.go +++ b/internal/certdeploy/deployers/sp_byteplus_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeBytePlusCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForBytePlus{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForBytePlus{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := bytepluscdn.NewSSLDeployerProvider(&bytepluscdn.SSLDeployerProviderConfig{ - AccessKey: access.AccessKey, - SecretKey: access.SecretKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKey: credentials.AccessKey, + SecretKey: credentials.SecretKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_cachefly.go b/internal/certdeploy/deployers/sp_cachefly.go index ce127d3ce..f98cee43b 100644 --- a/internal/certdeploy/deployers/sp_cachefly.go +++ b/internal/certdeploy/deployers/sp_cachefly.go @@ -11,13 +11,13 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeCacheFly, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForCacheFly{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCacheFly{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := cachefly.NewSSLDeployerProvider(&cachefly.SSLDeployerProviderConfig{ - ApiToken: access.ApiToken, + ApiToken: credentials.ApiToken, }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_cdnfly.go b/internal/certdeploy/deployers/sp_cdnfly.go index 6cd19cf5c..25e3fff31 100644 --- a/internal/certdeploy/deployers/sp_cdnfly.go +++ b/internal/certdeploy/deployers/sp_cdnfly.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeCdnfly, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForCdnfly{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCdnfly{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } deployer, err := cdnfly.NewSSLDeployerProvider(&cdnfly.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiKey: access.ApiKey, - ApiSecret: access.ApiSecret, - AllowInsecureConnections: access.AllowInsecureConnections, - ResourceType: cdnfly.ResourceType(xmaps.GetOrDefaultString(options.ProviderConfig, "resourceType", string(cdnfly.RESOURCE_TYPE_SITE))), - SiteId: xmaps.GetString(options.ProviderConfig, "siteId"), - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), + ServerUrl: credentials.ServerUrl, + ApiKey: credentials.ApiKey, + ApiSecret: credentials.ApiSecret, + AllowInsecureConnections: credentials.AllowInsecureConnections, + ResourceType: cdnfly.ResourceType(xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "resourceType", string(cdnfly.RESOURCE_TYPE_SITE))), + SiteId: xmaps.GetString(options.ProviderExtendedConfig, "siteId"), + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return deployer, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ctcccloud_ao.go b/internal/certdeploy/deployers/sp_ctcccloud_ao.go index 96c7c59ea..132294e9e 100644 --- a/internal/certdeploy/deployers/sp_ctcccloud_ao.go +++ b/internal/certdeploy/deployers/sp_ctcccloud_ao.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeCTCCCloudAO, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForCTCCCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCTCCCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ctcccloudao.NewSSLDeployerProvider(&ctcccloudao.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ctcccloud_cdn.go b/internal/certdeploy/deployers/sp_ctcccloud_cdn.go index 905846408..3490a6ae3 100644 --- a/internal/certdeploy/deployers/sp_ctcccloud_cdn.go +++ b/internal/certdeploy/deployers/sp_ctcccloud_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeCTCCCloudCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForCTCCCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCTCCCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ctcccloudcdn.NewSSLDeployerProvider(&ctcccloudcdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ctcccloud_cms.go b/internal/certdeploy/deployers/sp_ctcccloud_cms.go index f1cc97e43..e557d933f 100644 --- a/internal/certdeploy/deployers/sp_ctcccloud_cms.go +++ b/internal/certdeploy/deployers/sp_ctcccloud_cms.go @@ -11,14 +11,14 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeCTCCCloudCMS, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForCTCCCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCTCCCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ctcccloudcms.NewSSLDeployerProvider(&ctcccloudcms.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ctcccloud_elb.go b/internal/certdeploy/deployers/sp_ctcccloud_elb.go index 1496d2ba7..f21a30c2f 100644 --- a/internal/certdeploy/deployers/sp_ctcccloud_elb.go +++ b/internal/certdeploy/deployers/sp_ctcccloud_elb.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeCTCCCloudELB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForCTCCCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCTCCCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ctcccloudelb.NewSSLDeployerProvider(&ctcccloudelb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - RegionId: xmaps.GetString(options.ProviderConfig, "regionId"), - ResourceType: ctcccloudelb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), + ResourceType: ctcccloudelb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ctcccloud_icdn.go b/internal/certdeploy/deployers/sp_ctcccloud_icdn.go index 4e7faa95a..2c3b2d6bf 100644 --- a/internal/certdeploy/deployers/sp_ctcccloud_icdn.go +++ b/internal/certdeploy/deployers/sp_ctcccloud_icdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeCTCCCloudICDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForCTCCCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCTCCCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ctcccloudicdn.NewSSLDeployerProvider(&ctcccloudicdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ctcccloud_lvdn.go b/internal/certdeploy/deployers/sp_ctcccloud_lvdn.go index 35d12c3e0..c3ea276fa 100644 --- a/internal/certdeploy/deployers/sp_ctcccloud_lvdn.go +++ b/internal/certdeploy/deployers/sp_ctcccloud_lvdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeCTCCCloudLVDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForCTCCCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForCTCCCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ctcccloudlvdn.NewSSLDeployerProvider(&ctcccloudlvdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_dogecloud_cdn.go b/internal/certdeploy/deployers/sp_dogecloud_cdn.go index 2f9152c24..11d56a179 100644 --- a/internal/certdeploy/deployers/sp_dogecloud_cdn.go +++ b/internal/certdeploy/deployers/sp_dogecloud_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeDogeCloudCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForDogeCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForDogeCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := pDogeCDN.NewSSLDeployerProvider(&pDogeCDN.SSLDeployerProviderConfig{ - AccessKey: access.AccessKey, - SecretKey: access.SecretKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKey: credentials.AccessKey, + SecretKey: credentials.SecretKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_edgio_applications.go b/internal/certdeploy/deployers/sp_edgio_applications.go index 2a0da53cd..83f68387b 100644 --- a/internal/certdeploy/deployers/sp_edgio_applications.go +++ b/internal/certdeploy/deployers/sp_edgio_applications.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeEdgioApplications, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForEdgio{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForEdgio{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := edgioapps.NewSSLDeployerProvider(&edgioapps.SSLDeployerProviderConfig{ - ClientId: access.ClientId, - ClientSecret: access.ClientSecret, - EnvironmentId: xmaps.GetString(options.ProviderConfig, "environmentId"), + ClientId: credentials.ClientId, + ClientSecret: credentials.ClientSecret, + EnvironmentId: xmaps.GetString(options.ProviderExtendedConfig, "environmentId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_flexcdn.go b/internal/certdeploy/deployers/sp_flexcdn.go index 2da0a4fc4..9db33000d 100644 --- a/internal/certdeploy/deployers/sp_flexcdn.go +++ b/internal/certdeploy/deployers/sp_flexcdn.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeFlexCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForFlexCDN{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForFlexCDN{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := flexcdn.NewSSLDeployerProvider(&flexcdn.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiRole: access.ApiRole, - AccessKeyId: access.AccessKeyId, - AccessKey: access.AccessKey, - AllowInsecureConnections: access.AllowInsecureConnections, - ResourceType: flexcdn.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - CertificateId: xmaps.GetInt64(options.ProviderConfig, "certificateId"), + ServerUrl: credentials.ServerUrl, + ApiRole: credentials.ApiRole, + AccessKeyId: credentials.AccessKeyId, + AccessKey: credentials.AccessKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, + ResourceType: flexcdn.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_gcore_cdn.go b/internal/certdeploy/deployers/sp_gcore_cdn.go index e35eac0ed..e85b7627f 100644 --- a/internal/certdeploy/deployers/sp_gcore_cdn.go +++ b/internal/certdeploy/deployers/sp_gcore_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeGcoreCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForGcore{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForGcore{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := gcorecdn.NewSSLDeployerProvider(&gcorecdn.SSLDeployerProviderConfig{ - ApiToken: access.ApiToken, - ResourceId: xmaps.GetInt64(options.ProviderConfig, "resourceId"), - CertificateId: xmaps.GetInt64(options.ProviderConfig, "certificateId"), + ApiToken: credentials.ApiToken, + ResourceId: xmaps.GetInt64(options.ProviderExtendedConfig, "resourceId"), + CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_goedge.go b/internal/certdeploy/deployers/sp_goedge.go index da89fb4e4..afdfc9a9d 100644 --- a/internal/certdeploy/deployers/sp_goedge.go +++ b/internal/certdeploy/deployers/sp_goedge.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeGoEdge, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForGoEdge{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForGoEdge{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := goedge.NewSSLDeployerProvider(&goedge.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiRole: access.ApiRole, - AccessKeyId: access.AccessKeyId, - AccessKey: access.AccessKey, - AllowInsecureConnections: access.AllowInsecureConnections, - ResourceType: goedge.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - CertificateId: xmaps.GetInt64(options.ProviderConfig, "certificateId"), + ServerUrl: credentials.ServerUrl, + ApiRole: credentials.ApiRole, + AccessKeyId: credentials.AccessKeyId, + AccessKey: credentials.AccessKey, + AllowInsecureConnections: credentials.AllowInsecureConnections, + ResourceType: goedge.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_huaweicloud_cdn.go b/internal/certdeploy/deployers/sp_huaweicloud_cdn.go index ca8800ce8..b53c34bf0 100644 --- a/internal/certdeploy/deployers/sp_huaweicloud_cdn.go +++ b/internal/certdeploy/deployers/sp_huaweicloud_cdn.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeHuaweiCloudCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForHuaweiCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForHuaweiCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := huaweicloudcdn.NewSSLDeployerProvider(&huaweicloudcdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - EnterpriseProjectId: access.EnterpriseProjectId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + EnterpriseProjectId: credentials.EnterpriseProjectId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_huaweicloud_elb.go b/internal/certdeploy/deployers/sp_huaweicloud_elb.go index 2b46f2d0b..41d91b7d6 100644 --- a/internal/certdeploy/deployers/sp_huaweicloud_elb.go +++ b/internal/certdeploy/deployers/sp_huaweicloud_elb.go @@ -11,20 +11,20 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeHuaweiCloudELB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForHuaweiCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForHuaweiCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := huaweicloudelb.NewSSLDeployerProvider(&huaweicloudelb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - EnterpriseProjectId: access.EnterpriseProjectId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: huaweicloudelb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + EnterpriseProjectId: credentials.EnterpriseProjectId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: huaweicloudelb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_huaweicloud_scm.go b/internal/certdeploy/deployers/sp_huaweicloud_scm.go index baadebf76..fbc64ae47 100644 --- a/internal/certdeploy/deployers/sp_huaweicloud_scm.go +++ b/internal/certdeploy/deployers/sp_huaweicloud_scm.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeHuaweiCloudSCM, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForHuaweiCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForHuaweiCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := huaweicloudscm.NewSSLDeployerProvider(&huaweicloudscm.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - EnterpriseProjectId: access.EnterpriseProjectId, + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + EnterpriseProjectId: credentials.EnterpriseProjectId, }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_huaweicloud_waf.go b/internal/certdeploy/deployers/sp_huaweicloud_waf.go index 446a7d7f3..2ad5aeeb4 100644 --- a/internal/certdeploy/deployers/sp_huaweicloud_waf.go +++ b/internal/certdeploy/deployers/sp_huaweicloud_waf.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeHuaweiCloudWAF, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForHuaweiCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForHuaweiCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := huaweicloudwaf.NewSSLDeployerProvider(&huaweicloudwaf.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - SecretAccessKey: access.SecretAccessKey, - EnterpriseProjectId: access.EnterpriseProjectId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: huaweicloudwaf.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + SecretAccessKey: credentials.SecretAccessKey, + EnterpriseProjectId: credentials.EnterpriseProjectId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: huaweicloudwaf.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_jdcloud_alb.go b/internal/certdeploy/deployers/sp_jdcloud_alb.go index cb34db25e..813a6c9a3 100644 --- a/internal/certdeploy/deployers/sp_jdcloud_alb.go +++ b/internal/certdeploy/deployers/sp_jdcloud_alb.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeJDCloudALB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForJDCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForJDCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := jdcloudalb.NewSSLDeployerProvider(&jdcloudalb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - RegionId: xmaps.GetString(options.ProviderConfig, "regionId"), - ResourceType: jdcloudalb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), + ResourceType: jdcloudalb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_jdcloud_cdn.go b/internal/certdeploy/deployers/sp_jdcloud_cdn.go index 0ee0b427f..907a8fe8b 100644 --- a/internal/certdeploy/deployers/sp_jdcloud_cdn.go +++ b/internal/certdeploy/deployers/sp_jdcloud_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeJDCloudCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForJDCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForJDCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := jdcloudcdn.NewSSLDeployerProvider(&jdcloudcdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_jdcloud_live.go b/internal/certdeploy/deployers/sp_jdcloud_live.go index 3ff89df29..7dfedb88c 100644 --- a/internal/certdeploy/deployers/sp_jdcloud_live.go +++ b/internal/certdeploy/deployers/sp_jdcloud_live.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeJDCloudLive, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForJDCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForJDCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := jdcloudlive.NewSSLDeployerProvider(&jdcloudlive.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_jdcloud_vod.go b/internal/certdeploy/deployers/sp_jdcloud_vod.go index f37d7b2da..1b9efc3de 100644 --- a/internal/certdeploy/deployers/sp_jdcloud_vod.go +++ b/internal/certdeploy/deployers/sp_jdcloud_vod.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeJDCloudVOD, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForJDCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForJDCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := jdcloudvod.NewSSLDeployerProvider(&jdcloudvod.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_kong.go b/internal/certdeploy/deployers/sp_kong.go index 63c7302ae..54d0c810e 100644 --- a/internal/certdeploy/deployers/sp_kong.go +++ b/internal/certdeploy/deployers/sp_kong.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeKong, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForKong{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForKong{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := kong.NewSSLDeployerProvider(&kong.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiToken: access.ApiToken, - AllowInsecureConnections: access.AllowInsecureConnections, - ResourceType: kong.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - Workspace: xmaps.GetString(options.ProviderConfig, "workspace"), - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), + ServerUrl: credentials.ServerUrl, + ApiToken: credentials.ApiToken, + AllowInsecureConnections: credentials.AllowInsecureConnections, + ResourceType: kong.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + Workspace: xmaps.GetString(options.ProviderExtendedConfig, "workspace"), + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_kubernetes_secret.go b/internal/certdeploy/deployers/sp_kubernetes_secret.go index 9d716095e..85d6fc051 100644 --- a/internal/certdeploy/deployers/sp_kubernetes_secret.go +++ b/internal/certdeploy/deployers/sp_kubernetes_secret.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeKubernetesSecret, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForKubernetes{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForKubernetes{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := k8ssecret.NewSSLDeployerProvider(&k8ssecret.SSLDeployerProviderConfig{ - KubeConfig: access.KubeConfig, - Namespace: xmaps.GetOrDefaultString(options.ProviderConfig, "namespace", "default"), - SecretName: xmaps.GetString(options.ProviderConfig, "secretName"), - SecretType: xmaps.GetOrDefaultString(options.ProviderConfig, "secretType", "kubernetes.io/tls"), - SecretDataKeyForCrt: xmaps.GetOrDefaultString(options.ProviderConfig, "secretDataKeyForCrt", "tls.crt"), - SecretDataKeyForKey: xmaps.GetOrDefaultString(options.ProviderConfig, "secretDataKeyForKey", "tls.key"), + KubeConfig: credentials.KubeConfig, + Namespace: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "namespace", "default"), + SecretName: xmaps.GetString(options.ProviderExtendedConfig, "secretName"), + SecretType: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "secretType", "kubernetes.io/tls"), + SecretDataKeyForCrt: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "secretDataKeyForCrt", "tls.crt"), + SecretDataKeyForKey: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "secretDataKeyForKey", "tls.key"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_lecdn.go b/internal/certdeploy/deployers/sp_lecdn.go index 3cad2c66e..3f7d41674 100644 --- a/internal/certdeploy/deployers/sp_lecdn.go +++ b/internal/certdeploy/deployers/sp_lecdn.go @@ -11,21 +11,21 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeLeCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForLeCDN{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForLeCDN{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := lecdn.NewSSLDeployerProvider(&lecdn.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiVersion: access.ApiVersion, - ApiRole: access.ApiRole, - Username: access.Username, - Password: access.Password, - AllowInsecureConnections: access.AllowInsecureConnections, - ResourceType: lecdn.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - CertificateId: xmaps.GetInt64(options.ProviderConfig, "certificateId"), - ClientId: xmaps.GetInt64(options.ProviderConfig, "clientId"), + ServerUrl: credentials.ServerUrl, + ApiVersion: credentials.ApiVersion, + ApiRole: credentials.ApiRole, + Username: credentials.Username, + Password: credentials.Password, + AllowInsecureConnections: credentials.AllowInsecureConnections, + ResourceType: lecdn.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), + ClientId: xmaps.GetInt64(options.ProviderExtendedConfig, "clientId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_local.go b/internal/certdeploy/deployers/sp_local.go index 53654ee97..7fecea654 100644 --- a/internal/certdeploy/deployers/sp_local.go +++ b/internal/certdeploy/deployers/sp_local.go @@ -10,18 +10,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeLocal, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { provider, err := local.NewSSLDeployerProvider(&local.SSLDeployerProviderConfig{ - ShellEnv: local.ShellEnvType(xmaps.GetString(options.ProviderConfig, "shellEnv")), - PreCommand: xmaps.GetString(options.ProviderConfig, "preCommand"), - PostCommand: xmaps.GetString(options.ProviderConfig, "postCommand"), - OutputFormat: local.OutputFormatType(xmaps.GetOrDefaultString(options.ProviderConfig, "format", string(local.OUTPUT_FORMAT_PEM))), - OutputCertPath: xmaps.GetString(options.ProviderConfig, "certPath"), - OutputServerCertPath: xmaps.GetString(options.ProviderConfig, "certPathForServerOnly"), - OutputIntermediaCertPath: xmaps.GetString(options.ProviderConfig, "certPathForIntermediaOnly"), - OutputKeyPath: xmaps.GetString(options.ProviderConfig, "keyPath"), - PfxPassword: xmaps.GetString(options.ProviderConfig, "pfxPassword"), - JksAlias: xmaps.GetString(options.ProviderConfig, "jksAlias"), - JksKeypass: xmaps.GetString(options.ProviderConfig, "jksKeypass"), - JksStorepass: xmaps.GetString(options.ProviderConfig, "jksStorepass"), + ShellEnv: local.ShellEnvType(xmaps.GetString(options.ProviderExtendedConfig, "shellEnv")), + PreCommand: xmaps.GetString(options.ProviderExtendedConfig, "preCommand"), + PostCommand: xmaps.GetString(options.ProviderExtendedConfig, "postCommand"), + OutputFormat: local.OutputFormatType(xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "format", string(local.OUTPUT_FORMAT_PEM))), + OutputCertPath: xmaps.GetString(options.ProviderExtendedConfig, "certPath"), + OutputServerCertPath: xmaps.GetString(options.ProviderExtendedConfig, "certPathForServerOnly"), + OutputIntermediaCertPath: xmaps.GetString(options.ProviderExtendedConfig, "certPathForIntermediaOnly"), + OutputKeyPath: xmaps.GetString(options.ProviderExtendedConfig, "keyPath"), + PfxPassword: xmaps.GetString(options.ProviderExtendedConfig, "pfxPassword"), + JksAlias: xmaps.GetString(options.ProviderExtendedConfig, "jksAlias"), + JksKeypass: xmaps.GetString(options.ProviderExtendedConfig, "jksKeypass"), + JksStorepass: xmaps.GetString(options.ProviderExtendedConfig, "jksStorepass"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_netlify_site.go b/internal/certdeploy/deployers/sp_netlify_site.go index bbfec01b5..66b44993b 100644 --- a/internal/certdeploy/deployers/sp_netlify_site.go +++ b/internal/certdeploy/deployers/sp_netlify_site.go @@ -11,14 +11,14 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeNetlifySite, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForNetlify{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForNetlify{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := netlifysite.NewSSLDeployerProvider(&netlifysite.SSLDeployerProviderConfig{ - ApiToken: access.ApiToken, - SiteId: xmaps.GetString(options.ProviderConfig, "siteId"), + ApiToken: credentials.ApiToken, + SiteId: xmaps.GetString(options.ProviderExtendedConfig, "siteId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_proxmoxve.go b/internal/certdeploy/deployers/sp_proxmoxve.go index 818c2d648..9dab24abc 100644 --- a/internal/certdeploy/deployers/sp_proxmoxve.go +++ b/internal/certdeploy/deployers/sp_proxmoxve.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeProxmoxVE, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForProxmoxVE{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForProxmoxVE{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := proxmoxve.NewSSLDeployerProvider(&proxmoxve.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiToken: access.ApiToken, - ApiTokenSecret: access.ApiTokenSecret, - AllowInsecureConnections: access.AllowInsecureConnections, - NodeName: xmaps.GetString(options.ProviderConfig, "nodeName"), - AutoRestart: xmaps.GetBool(options.ProviderConfig, "autoRestart"), + ServerUrl: credentials.ServerUrl, + ApiToken: credentials.ApiToken, + ApiTokenSecret: credentials.ApiTokenSecret, + AllowInsecureConnections: credentials.AllowInsecureConnections, + NodeName: xmaps.GetString(options.ProviderExtendedConfig, "nodeName"), + AutoRestart: xmaps.GetBool(options.ProviderExtendedConfig, "autoRestart"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_qiniu_cdn.go b/internal/certdeploy/deployers/sp_qiniu_cdn.go index 7355eca25..9c25227d9 100644 --- a/internal/certdeploy/deployers/sp_qiniu_cdn.go +++ b/internal/certdeploy/deployers/sp_qiniu_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeQiniuCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForQiniu{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForQiniu{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := qiniucdn.NewSSLDeployerProvider(&qiniucdn.SSLDeployerProviderConfig{ - AccessKey: access.AccessKey, - SecretKey: access.SecretKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKey: credentials.AccessKey, + SecretKey: credentials.SecretKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_qiniu_kodo.go b/internal/certdeploy/deployers/sp_qiniu_kodo.go index 92624dd54..0e89d4e51 100644 --- a/internal/certdeploy/deployers/sp_qiniu_kodo.go +++ b/internal/certdeploy/deployers/sp_qiniu_kodo.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeQiniuKodo, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForQiniu{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForQiniu{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := qiniukodo.NewSSLDeployerProvider(&qiniukodo.SSLDeployerProviderConfig{ - AccessKey: access.AccessKey, - SecretKey: access.SecretKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKey: credentials.AccessKey, + SecretKey: credentials.SecretKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_qiniu_pili.go b/internal/certdeploy/deployers/sp_qiniu_pili.go index 1d7358279..6beb204d3 100644 --- a/internal/certdeploy/deployers/sp_qiniu_pili.go +++ b/internal/certdeploy/deployers/sp_qiniu_pili.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeQiniuPili, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForQiniu{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForQiniu{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := qiniupili.NewSSLDeployerProvider(&qiniupili.SSLDeployerProviderConfig{ - AccessKey: access.AccessKey, - SecretKey: access.SecretKey, - Hub: xmaps.GetString(options.ProviderConfig, "hub"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKey: credentials.AccessKey, + SecretKey: credentials.SecretKey, + Hub: xmaps.GetString(options.ProviderExtendedConfig, "hub"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_rainyun_rcdn.go b/internal/certdeploy/deployers/sp_rainyun_rcdn.go index 78f199b5e..0a90c0502 100644 --- a/internal/certdeploy/deployers/sp_rainyun_rcdn.go +++ b/internal/certdeploy/deployers/sp_rainyun_rcdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeRainYunRCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForRainYun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForRainYun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := rainyunrcdn.NewSSLDeployerProvider(&rainyunrcdn.SSLDeployerProviderConfig{ - ApiKey: access.ApiKey, - InstanceId: xmaps.GetInt32(options.ProviderConfig, "instanceId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + ApiKey: credentials.ApiKey, + InstanceId: xmaps.GetInt32(options.ProviderExtendedConfig, "instanceId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ratpanel_console.go b/internal/certdeploy/deployers/sp_ratpanel_console.go index e80493145..1bee3fc3a 100644 --- a/internal/certdeploy/deployers/sp_ratpanel_console.go +++ b/internal/certdeploy/deployers/sp_ratpanel_console.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeRatPanelConsole, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForRatPanel{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForRatPanel{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ratpanelconsole.NewSSLDeployerProvider(&ratpanelconsole.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - AccessTokenId: access.AccessTokenId, - AccessToken: access.AccessToken, - AllowInsecureConnections: access.AllowInsecureConnections, + ServerUrl: credentials.ServerUrl, + AccessTokenId: credentials.AccessTokenId, + AccessToken: credentials.AccessToken, + AllowInsecureConnections: credentials.AllowInsecureConnections, }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ratpanel_site.go b/internal/certdeploy/deployers/sp_ratpanel_site.go index 21df41420..b364c995b 100644 --- a/internal/certdeploy/deployers/sp_ratpanel_site.go +++ b/internal/certdeploy/deployers/sp_ratpanel_site.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeRatPanelSite, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForRatPanel{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForRatPanel{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ratpanelsite.NewSSLDeployerProvider(&ratpanelsite.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - AccessTokenId: access.AccessTokenId, - AccessToken: access.AccessToken, - AllowInsecureConnections: access.AllowInsecureConnections, - SiteName: xmaps.GetString(options.ProviderConfig, "siteName"), + ServerUrl: credentials.ServerUrl, + AccessTokenId: credentials.AccessTokenId, + AccessToken: credentials.AccessToken, + AllowInsecureConnections: credentials.AllowInsecureConnections, + SiteName: xmaps.GetString(options.ProviderExtendedConfig, "siteName"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_safeline.go b/internal/certdeploy/deployers/sp_safeline.go index 02db575c3..6b528fd37 100644 --- a/internal/certdeploy/deployers/sp_safeline.go +++ b/internal/certdeploy/deployers/sp_safeline.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeSafeLine, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForSafeLine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForSafeLine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := safeline.NewSSLDeployerProvider(&safeline.SSLDeployerProviderConfig{ - ServerUrl: access.ServerUrl, - ApiToken: access.ApiToken, - AllowInsecureConnections: access.AllowInsecureConnections, - ResourceType: safeline.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - CertificateId: xmaps.GetInt32(options.ProviderConfig, "certificateId"), + ServerUrl: credentials.ServerUrl, + ApiToken: credentials.ApiToken, + AllowInsecureConnections: credentials.AllowInsecureConnections, + ResourceType: safeline.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + CertificateId: xmaps.GetInt32(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ssh.go b/internal/certdeploy/deployers/sp_ssh.go index cf8b5f551..ee81c0f17 100644 --- a/internal/certdeploy/deployers/sp_ssh.go +++ b/internal/certdeploy/deployers/sp_ssh.go @@ -11,13 +11,13 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeSSH, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForSSH{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForSSH{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - jumpServers := make([]ssh.JumpServerConfig, len(access.JumpServers)) - for i, jumpServer := range access.JumpServers { + jumpServers := make([]ssh.JumpServerConfig, len(credentials.JumpServers)) + for i, jumpServer := range credentials.JumpServers { jumpServers[i] = ssh.JumpServerConfig{ SshHost: jumpServer.Host, SshPort: jumpServer.Port, @@ -30,26 +30,26 @@ func init() { } provider, err := ssh.NewSSLDeployerProvider(&ssh.SSLDeployerProviderConfig{ - SshHost: access.Host, - SshPort: access.Port, - SshAuthMethod: access.AuthMethod, - SshUsername: access.Username, - SshPassword: access.Password, - SshKey: access.Key, - SshKeyPassphrase: access.KeyPassphrase, + SshHost: credentials.Host, + SshPort: credentials.Port, + SshAuthMethod: credentials.AuthMethod, + SshUsername: credentials.Username, + SshPassword: credentials.Password, + SshKey: credentials.Key, + SshKeyPassphrase: credentials.KeyPassphrase, JumpServers: jumpServers, - UseSCP: xmaps.GetBool(options.ProviderConfig, "useSCP"), - PreCommand: xmaps.GetString(options.ProviderConfig, "preCommand"), - PostCommand: xmaps.GetString(options.ProviderConfig, "postCommand"), - OutputFormat: ssh.OutputFormatType(xmaps.GetOrDefaultString(options.ProviderConfig, "format", string(ssh.OUTPUT_FORMAT_PEM))), - OutputCertPath: xmaps.GetString(options.ProviderConfig, "certPath"), - OutputServerCertPath: xmaps.GetString(options.ProviderConfig, "certPathForServerOnly"), - OutputIntermediaCertPath: xmaps.GetString(options.ProviderConfig, "certPathForIntermediaOnly"), - OutputKeyPath: xmaps.GetString(options.ProviderConfig, "keyPath"), - PfxPassword: xmaps.GetString(options.ProviderConfig, "pfxPassword"), - JksAlias: xmaps.GetString(options.ProviderConfig, "jksAlias"), - JksKeypass: xmaps.GetString(options.ProviderConfig, "jksKeypass"), - JksStorepass: xmaps.GetString(options.ProviderConfig, "jksStorepass"), + UseSCP: xmaps.GetBool(options.ProviderExtendedConfig, "useSCP"), + PreCommand: xmaps.GetString(options.ProviderExtendedConfig, "preCommand"), + PostCommand: xmaps.GetString(options.ProviderExtendedConfig, "postCommand"), + OutputFormat: ssh.OutputFormatType(xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "format", string(ssh.OUTPUT_FORMAT_PEM))), + OutputCertPath: xmaps.GetString(options.ProviderExtendedConfig, "certPath"), + OutputServerCertPath: xmaps.GetString(options.ProviderExtendedConfig, "certPathForServerOnly"), + OutputIntermediaCertPath: xmaps.GetString(options.ProviderExtendedConfig, "certPathForIntermediaOnly"), + OutputKeyPath: xmaps.GetString(options.ProviderExtendedConfig, "keyPath"), + PfxPassword: xmaps.GetString(options.ProviderExtendedConfig, "pfxPassword"), + JksAlias: xmaps.GetString(options.ProviderExtendedConfig, "jksAlias"), + JksKeypass: xmaps.GetString(options.ProviderExtendedConfig, "jksKeypass"), + JksStorepass: xmaps.GetString(options.ProviderExtendedConfig, "jksStorepass"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_cdn.go b/internal/certdeploy/deployers/sp_tencentcloud_cdn.go index eed0e9c8f..343d78c06 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_cdn.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_cdn.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudcdn.NewSSLDeployerProvider(&tencentcloudcdn.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_clb.go b/internal/certdeploy/deployers/sp_tencentcloud_clb.go index 10418f960..c7731db18 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_clb.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_clb.go @@ -11,20 +11,20 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudCLB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudclb.NewSSLDeployerProvider(&tencentcloudclb.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: tencentcloudclb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: tencentcloudclb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_cos.go b/internal/certdeploy/deployers/sp_tencentcloud_cos.go index a4b151f9e..9180524ac 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_cos.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_cos.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudCOS, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudcos.NewSSLDeployerProvider(&tencentcloudcos.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - Bucket: xmaps.GetString(options.ProviderConfig, "bucket"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_css.go b/internal/certdeploy/deployers/sp_tencentcloud_css.go index a6a52573b..7d5d2a229 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_css.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_css.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudCSS, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudcss.NewSSLDeployerProvider(&tencentcloudcss.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_ecdn.go b/internal/certdeploy/deployers/sp_tencentcloud_ecdn.go index 293071b7a..8993578ec 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_ecdn.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_ecdn.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudECDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudecdn.NewSSLDeployerProvider(&tencentcloudecdn.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_eo.go b/internal/certdeploy/deployers/sp_tencentcloud_eo.go index f066ed2de..3732ac469 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_eo.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_eo.go @@ -14,17 +14,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudEO, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudeo.NewSSLDeployerProvider(&tencentcloudeo.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - ZoneId: xmaps.GetString(options.ProviderConfig, "zoneId"), - Domains: lo.Filter(strings.Split(xmaps.GetString(options.ProviderConfig, "domains"), ";"), func(s string, _ int) bool { return s != "" }), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + ZoneId: xmaps.GetString(options.ProviderExtendedConfig, "zoneId"), + Domains: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "domains"), ";"), func(s string, _ int) bool { return s != "" }), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_gaap.go b/internal/certdeploy/deployers/sp_tencentcloud_gaap.go index 57e6441ad..c7c2ce9ef 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_gaap.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_gaap.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudGAAP, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudgaap.NewSSLDeployerProvider(&tencentcloudgaap.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - ResourceType: tencentcloudgaap.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - ProxyId: xmaps.GetString(options.ProviderConfig, "proxyId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + ResourceType: tencentcloudgaap.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + ProxyId: xmaps.GetString(options.ProviderExtendedConfig, "proxyId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_scf.go b/internal/certdeploy/deployers/sp_tencentcloud_scf.go index e2428deef..4ba0de86e 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_scf.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_scf.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudSCF, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudscf.NewSSLDeployerProvider(&tencentcloudscf.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - Region: xmaps.GetString(options.ProviderConfig, "region"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_ssl.go b/internal/certdeploy/deployers/sp_tencentcloud_ssl.go index 510f61919..9bf2b9767 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_ssl.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_ssl.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudSSL, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudssl.NewSSLDeployerProvider(&tencentcloudssl.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_ssldeploy.go b/internal/certdeploy/deployers/sp_tencentcloud_ssldeploy.go index 6d358187e..fafff43e9 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_ssldeploy.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_ssldeploy.go @@ -14,18 +14,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudSSLDeploy, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudssldeploy.NewSSLDeployerProvider(&tencentcloudssldeploy.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: xmaps.GetString(options.ProviderConfig, "resourceType"), - ResourceIds: lo.Filter(strings.Split(xmaps.GetString(options.ProviderConfig, "resourceIds"), ";"), func(s string, _ int) bool { return s != "" }), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: xmaps.GetString(options.ProviderExtendedConfig, "resourceType"), + ResourceIds: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "resourceIds"), ";"), func(s string, _ int) bool { return s != "" }), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_sslupdate.go b/internal/certdeploy/deployers/sp_tencentcloud_sslupdate.go index e3b6e29bf..f8329fba5 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_sslupdate.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_sslupdate.go @@ -14,19 +14,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudSSLUpdate, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudsslupdate.NewSSLDeployerProvider(&tencentcloudsslupdate.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), - IsReplaced: xmaps.GetBool(options.ProviderConfig, "isReplaced"), - ResourceTypes: lo.Filter(strings.Split(xmaps.GetString(options.ProviderConfig, "resourceTypes"), ";"), func(s string, _ int) bool { return s != "" }), - ResourceRegions: lo.Filter(strings.Split(xmaps.GetString(options.ProviderConfig, "resourceRegions"), ";"), func(s string, _ int) bool { return s != "" }), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), + IsReplaced: xmaps.GetBool(options.ProviderExtendedConfig, "isReplaced"), + ResourceTypes: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "resourceTypes"), ";"), func(s string, _ int) bool { return s != "" }), + ResourceRegions: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "resourceRegions"), ";"), func(s string, _ int) bool { return s != "" }), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_vod.go b/internal/certdeploy/deployers/sp_tencentcloud_vod.go index 80a8ec458..3c24e55c8 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_vod.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_vod.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudVOD, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudvod.NewSSLDeployerProvider(&tencentcloudvod.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - SubAppId: xmaps.GetInt64(options.ProviderConfig, "subAppId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + SubAppId: xmaps.GetInt64(options.ProviderExtendedConfig, "subAppId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_tencentcloud_waf.go b/internal/certdeploy/deployers/sp_tencentcloud_waf.go index 4b0d2ef6d..ab37777bf 100644 --- a/internal/certdeploy/deployers/sp_tencentcloud_waf.go +++ b/internal/certdeploy/deployers/sp_tencentcloud_waf.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeTencentCloudWAF, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForTencentCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTencentCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := tencentcloudwaf.NewSSLDeployerProvider(&tencentcloudwaf.SSLDeployerProviderConfig{ - SecretId: access.SecretId, - SecretKey: access.SecretKey, - Endpoint: xmaps.GetString(options.ProviderConfig, "endpoint"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), - DomainId: xmaps.GetString(options.ProviderConfig, "domainId"), - InstanceId: xmaps.GetString(options.ProviderConfig, "instanceId"), + SecretId: credentials.SecretId, + SecretKey: credentials.SecretKey, + Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), + DomainId: xmaps.GetString(options.ProviderExtendedConfig, "domainId"), + InstanceId: xmaps.GetString(options.ProviderExtendedConfig, "instanceId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ucloud_ucdn.go b/internal/certdeploy/deployers/sp_ucloud_ucdn.go index 645265b27..c87cc05c4 100644 --- a/internal/certdeploy/deployers/sp_ucloud_ucdn.go +++ b/internal/certdeploy/deployers/sp_ucloud_ucdn.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeUCloudUCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForUCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForUCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := uclouducdn.NewSSLDeployerProvider(&uclouducdn.SSLDeployerProviderConfig{ - PrivateKey: access.PrivateKey, - PublicKey: access.PublicKey, - ProjectId: access.ProjectId, - DomainId: xmaps.GetString(options.ProviderConfig, "domainId"), + PrivateKey: credentials.PrivateKey, + PublicKey: credentials.PublicKey, + ProjectId: credentials.ProjectId, + DomainId: xmaps.GetString(options.ProviderExtendedConfig, "domainId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_ucloud_us3.go b/internal/certdeploy/deployers/sp_ucloud_us3.go index a447ab9ed..dafb1ef5c 100644 --- a/internal/certdeploy/deployers/sp_ucloud_us3.go +++ b/internal/certdeploy/deployers/sp_ucloud_us3.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeUCloudUS3, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForUCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForUCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := ucloudus3.NewSSLDeployerProvider(&ucloudus3.SSLDeployerProviderConfig{ - PrivateKey: access.PrivateKey, - PublicKey: access.PublicKey, - ProjectId: access.ProjectId, - Region: xmaps.GetString(options.ProviderConfig, "region"), - Bucket: xmaps.GetString(options.ProviderConfig, "bucket"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + PrivateKey: credentials.PrivateKey, + PublicKey: credentials.PublicKey, + ProjectId: credentials.ProjectId, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_unicloud_webhost.go b/internal/certdeploy/deployers/sp_unicloud_webhost.go index 1b6dadb9c..9689ad04c 100644 --- a/internal/certdeploy/deployers/sp_unicloud_webhost.go +++ b/internal/certdeploy/deployers/sp_unicloud_webhost.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeUniCloudWebHost, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForUniCloud{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForUniCloud{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := unicloudwebhost.NewSSLDeployerProvider(&unicloudwebhost.SSLDeployerProviderConfig{ - Username: access.Username, - Password: access.Password, - SpaceProvider: xmaps.GetString(options.ProviderConfig, "spaceProvider"), - SpaceId: xmaps.GetString(options.ProviderConfig, "spaceId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + Username: credentials.Username, + Password: credentials.Password, + SpaceProvider: xmaps.GetString(options.ProviderExtendedConfig, "spaceProvider"), + SpaceId: xmaps.GetString(options.ProviderExtendedConfig, "spaceId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_upyun_cdn.go b/internal/certdeploy/deployers/sp_upyun_cdn.go index bfd4d7ac3..9dd549cad 100644 --- a/internal/certdeploy/deployers/sp_upyun_cdn.go +++ b/internal/certdeploy/deployers/sp_upyun_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeUpyunCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForUpyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForUpyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := upyuncdn.NewSSLDeployerProvider(&upyuncdn.SSLDeployerProviderConfig{ - Username: access.Username, - Password: access.Password, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + Username: credentials.Username, + Password: credentials.Password, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_upyun_file.go b/internal/certdeploy/deployers/sp_upyun_file.go index 0b4aa62bf..998265738 100644 --- a/internal/certdeploy/deployers/sp_upyun_file.go +++ b/internal/certdeploy/deployers/sp_upyun_file.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeUpyunFile, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForUpyun{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForUpyun{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := upyuncdn.NewSSLDeployerProvider(&upyuncdn.SSLDeployerProviderConfig{ - Username: access.Username, - Password: access.Password, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + Username: credentials.Username, + Password: credentials.Password, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_volcengine_alb.go b/internal/certdeploy/deployers/sp_volcengine_alb.go index f670efe9a..a167d23cd 100644 --- a/internal/certdeploy/deployers/sp_volcengine_alb.go +++ b/internal/certdeploy/deployers/sp_volcengine_alb.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeVolcEngineALB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcenginealb.NewSSLDeployerProvider(&volcenginealb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: volcenginealb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: volcenginealb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_volcengine_cdn.go b/internal/certdeploy/deployers/sp_volcengine_cdn.go index 77d2ad54b..8553338f2 100644 --- a/internal/certdeploy/deployers/sp_volcengine_cdn.go +++ b/internal/certdeploy/deployers/sp_volcengine_cdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeVolcEngineCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcenginecdn.NewSSLDeployerProvider(&volcenginecdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.SecretAccessKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.SecretAccessKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_volcengine_certcenter.go b/internal/certdeploy/deployers/sp_volcengine_certcenter.go index c56cad630..d14093584 100644 --- a/internal/certdeploy/deployers/sp_volcengine_certcenter.go +++ b/internal/certdeploy/deployers/sp_volcengine_certcenter.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeVolcEngineCertCenter, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcenginecertcenter.NewSSLDeployerProvider(&volcenginecertcenter.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_volcengine_clb.go b/internal/certdeploy/deployers/sp_volcengine_clb.go index a8a4f2a39..2f7f87fe7 100644 --- a/internal/certdeploy/deployers/sp_volcengine_clb.go +++ b/internal/certdeploy/deployers/sp_volcengine_clb.go @@ -11,18 +11,18 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeVolcEngineCLB, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcengineclb.NewSSLDeployerProvider(&volcengineclb.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ResourceType: volcengineclb.ResourceType(xmaps.GetString(options.ProviderConfig, "resourceType")), - LoadbalancerId: xmaps.GetString(options.ProviderConfig, "loadbalancerId"), - ListenerId: xmaps.GetString(options.ProviderConfig, "listenerId"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ResourceType: volcengineclb.ResourceType(xmaps.GetString(options.ProviderExtendedConfig, "resourceType")), + LoadbalancerId: xmaps.GetString(options.ProviderExtendedConfig, "loadbalancerId"), + ListenerId: xmaps.GetString(options.ProviderExtendedConfig, "listenerId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_volcengine_dcdn.go b/internal/certdeploy/deployers/sp_volcengine_dcdn.go index f09e78e0e..e4b0ac53d 100644 --- a/internal/certdeploy/deployers/sp_volcengine_dcdn.go +++ b/internal/certdeploy/deployers/sp_volcengine_dcdn.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeVolcEngineDCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcenginedcdn.NewSSLDeployerProvider(&volcenginedcdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.SecretAccessKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.SecretAccessKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_volcengine_imagex.go b/internal/certdeploy/deployers/sp_volcengine_imagex.go index 57ef48b51..fb3215c0a 100644 --- a/internal/certdeploy/deployers/sp_volcengine_imagex.go +++ b/internal/certdeploy/deployers/sp_volcengine_imagex.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeVolcEngineImageX, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcengineimagex.NewSSLDeployerProvider(&volcengineimagex.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - ServiceId: xmaps.GetString(options.ProviderConfig, "serviceId"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + ServiceId: xmaps.GetString(options.ProviderExtendedConfig, "serviceId"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_volcengine_live.go b/internal/certdeploy/deployers/sp_volcengine_live.go index cc0f20f40..95bfdbd61 100644 --- a/internal/certdeploy/deployers/sp_volcengine_live.go +++ b/internal/certdeploy/deployers/sp_volcengine_live.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeVolcEngineLive, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcenginelive.NewSSLDeployerProvider(&volcenginelive.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.SecretAccessKey, - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.SecretAccessKey, + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_volcengine_tos.go b/internal/certdeploy/deployers/sp_volcengine_tos.go index b4e2a670c..fe13937fd 100644 --- a/internal/certdeploy/deployers/sp_volcengine_tos.go +++ b/internal/certdeploy/deployers/sp_volcengine_tos.go @@ -11,17 +11,17 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeVolcEngineTOS, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForVolcEngine{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForVolcEngine{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := volcenginetos.NewSSLDeployerProvider(&volcenginetos.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.SecretAccessKey, - Region: xmaps.GetString(options.ProviderConfig, "region"), - Bucket: xmaps.GetString(options.ProviderConfig, "bucket"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.SecretAccessKey, + Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), + Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_wangsu_cdn.go b/internal/certdeploy/deployers/sp_wangsu_cdn.go index 655b9f3bd..7098702c1 100644 --- a/internal/certdeploy/deployers/sp_wangsu_cdn.go +++ b/internal/certdeploy/deployers/sp_wangsu_cdn.go @@ -14,15 +14,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeWangsuCDN, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForWangsu{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForWangsu{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := wangsucdn.NewSSLDeployerProvider(&wangsucdn.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - Domains: lo.Filter(strings.Split(xmaps.GetString(options.ProviderConfig, "domains"), ";"), func(s string, _ int) bool { return s != "" }), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + Domains: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "domains"), ";"), func(s string, _ int) bool { return s != "" }), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_wangsu_cdnpro.go b/internal/certdeploy/deployers/sp_wangsu_cdnpro.go index 25e6d9fa4..2e8f2c81a 100644 --- a/internal/certdeploy/deployers/sp_wangsu_cdnpro.go +++ b/internal/certdeploy/deployers/sp_wangsu_cdnpro.go @@ -11,19 +11,19 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeWangsuCDNPro, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForWangsu{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForWangsu{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := wangsucdnpro.NewSSLDeployerProvider(&wangsucdnpro.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - ApiKey: access.ApiKey, - Environment: xmaps.GetOrDefaultString(options.ProviderConfig, "environment", "production"), - Domain: xmaps.GetString(options.ProviderConfig, "domain"), - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), - WebhookId: xmaps.GetString(options.ProviderConfig, "webhookId"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + ApiKey: credentials.ApiKey, + Environment: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "environment", "production"), + Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), + WebhookId: xmaps.GetString(options.ProviderExtendedConfig, "webhookId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_wangsu_certificate.go b/internal/certdeploy/deployers/sp_wangsu_certificate.go index 0c613e59d..32e4bd313 100644 --- a/internal/certdeploy/deployers/sp_wangsu_certificate.go +++ b/internal/certdeploy/deployers/sp_wangsu_certificate.go @@ -11,15 +11,15 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeWangsuCertificate, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForWangsu{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForWangsu{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := wangsucertificate.NewSSLDeployerProvider(&wangsucertificate.SSLDeployerProviderConfig{ - AccessKeyId: access.AccessKeyId, - AccessKeySecret: access.AccessKeySecret, - CertificateId: xmaps.GetString(options.ProviderConfig, "certificateId"), + AccessKeyId: credentials.AccessKeyId, + AccessKeySecret: credentials.AccessKeySecret, + CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), }) return provider, err }); err != nil { diff --git a/internal/certdeploy/deployers/sp_webhook.go b/internal/certdeploy/deployers/sp_webhook.go index ce68f8b73..271fc744c 100644 --- a/internal/certdeploy/deployers/sp_webhook.go +++ b/internal/certdeploy/deployers/sp_webhook.go @@ -13,13 +13,13 @@ import ( func init() { if err := Registries.Register(domain.DeploymentProviderTypeWebhook, func(options *ProviderFactoryOptions) (core.SSLDeployer, error) { - access := domain.AccessConfigForWebhook{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForWebhook{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } mergedHeaders := make(map[string]string) - if defaultHeadersString := access.HeadersString; defaultHeadersString != "" { + if defaultHeadersString := credentials.HeadersString; defaultHeadersString != "" { h, err := xhttp.ParseHeaders(defaultHeadersString) if err != nil { return nil, fmt.Errorf("failed to parse webhook headers: %w", err) @@ -28,7 +28,7 @@ func init() { mergedHeaders[http.CanonicalHeaderKey(key)] = h.Get(key) } } - if extendedHeadersString := xmaps.GetString(options.ProviderConfig, "headers"); extendedHeadersString != "" { + if extendedHeadersString := xmaps.GetString(options.ProviderExtendedConfig, "headers"); extendedHeadersString != "" { h, err := xhttp.ParseHeaders(extendedHeadersString) if err != nil { return nil, fmt.Errorf("failed to parse webhook headers: %w", err) @@ -39,11 +39,11 @@ func init() { } provider, err := webhook.NewSSLDeployerProvider(&webhook.SSLDeployerProviderConfig{ - WebhookUrl: access.Url, - WebhookData: xmaps.GetOrDefaultString(options.ProviderConfig, "webhookData", access.DataString), - Method: access.Method, + WebhookUrl: credentials.Url, + WebhookData: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "webhookData", credentials.DataString), + Method: credentials.Method, Headers: mergedHeaders, - AllowInsecureConnections: access.AllowInsecureConnections, + AllowInsecureConnections: credentials.AllowInsecureConnections, }) return provider, err }); err != nil { diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index cec8e38f0..0cb8fd209 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -31,9 +31,9 @@ func NewWithWorkflowNode(config DeployerWithWorkflowNodeConfig) (Deployer, error nodeCfg := config.Node.Data.Config.AsBizDeploy() options := &deployerProviderOptions{ - Provider: domain.DeploymentProviderType(nodeCfg.Provider), - ProviderAccessConfig: make(map[string]any), - ProviderServiceConfig: nodeCfg.ProviderConfig, + Provider: domain.DeploymentProviderType(nodeCfg.Provider), + ProviderAccessConfig: make(map[string]any), + ProviderExtendedConfig: nodeCfg.ProviderConfig, } accessRepo := repository.NewAccessRepository() diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index b96ed3531..18663d28e 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -7,9 +7,9 @@ import ( ) type deployerProviderOptions struct { - Provider domain.DeploymentProviderType - ProviderAccessConfig map[string]any - ProviderServiceConfig map[string]any + Provider domain.DeploymentProviderType + ProviderAccessConfig map[string]any + ProviderExtendedConfig map[string]any } func createSSLDeployerProvider(options *deployerProviderOptions) (core.SSLDeployer, error) { @@ -19,7 +19,7 @@ func createSSLDeployerProvider(options *deployerProviderOptions) (core.SSLDeploy } return provider(&deployers.ProviderFactoryOptions{ - AccessConfig: options.ProviderAccessConfig, - ProviderConfig: options.ProviderServiceConfig, + ProviderAccessConfig: options.ProviderAccessConfig, + ProviderExtendedConfig: options.ProviderExtendedConfig, }) } diff --git a/internal/notify/notifier.go b/internal/notify/notifier.go index 8220ac9c0..ec6c94bed 100644 --- a/internal/notify/notifier.go +++ b/internal/notify/notifier.go @@ -31,9 +31,9 @@ func NewWithWorkflowNode(config NotifierWithWorkflowNodeConfig) (Notifier, error nodeCfg := config.Node.Data.Config.AsBizNotify() options := ¬ifierProviderOptions{ - Provider: domain.NotificationProviderType(nodeCfg.Provider), - ProviderAccessConfig: make(map[string]any), - ProviderServiceConfig: nodeCfg.ProviderConfig, + Provider: domain.NotificationProviderType(nodeCfg.Provider), + ProviderAccessConfig: make(map[string]any), + ProviderExtendedConfig: nodeCfg.ProviderConfig, } accessRepo := repository.NewAccessRepository() diff --git a/internal/notify/notifiers/registry.go b/internal/notify/notifiers/registry.go index 588caf21b..b2d1720f3 100644 --- a/internal/notify/notifiers/registry.go +++ b/internal/notify/notifiers/registry.go @@ -10,8 +10,8 @@ import ( type ProviderFactoryFunc func(options *ProviderFactoryOptions) (core.Notifier, error) type ProviderFactoryOptions struct { - AccessConfig map[string]any - ProviderConfig map[string]any + ProviderAccessConfig map[string]any + ProviderExtendedConfig map[string]any } type Registry[T comparable] interface { diff --git a/internal/notify/notifiers/sp_dingtalkbot.go b/internal/notify/notifiers/sp_dingtalkbot.go index 4783436a3..f2eb93554 100644 --- a/internal/notify/notifiers/sp_dingtalkbot.go +++ b/internal/notify/notifiers/sp_dingtalkbot.go @@ -11,14 +11,14 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeDingTalkBot, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForDingTalkBot{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForDingTalkBot{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := dingtalkbot.NewNotifierProvider(&dingtalkbot.NotifierProviderConfig{ - WebhookUrl: access.WebhookUrl, - Secret: access.Secret, + WebhookUrl: credentials.WebhookUrl, + Secret: credentials.Secret, }) return provider, err }); err != nil { diff --git a/internal/notify/notifiers/sp_discordbot.go b/internal/notify/notifiers/sp_discordbot.go index 28902a3bf..2f2ebb715 100644 --- a/internal/notify/notifiers/sp_discordbot.go +++ b/internal/notify/notifiers/sp_discordbot.go @@ -11,14 +11,14 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeDiscordBot, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForDiscordBot{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForDiscordBot{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := discordbot.NewNotifierProvider(&discordbot.NotifierProviderConfig{ - BotToken: access.BotToken, - ChannelId: xmaps.GetOrDefaultString(options.ProviderConfig, "channelId", access.ChannelId), + BotToken: credentials.BotToken, + ChannelId: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "channelId", credentials.ChannelId), }) return provider, err }); err != nil { diff --git a/internal/notify/notifiers/sp_email.go b/internal/notify/notifiers/sp_email.go index edd617a1a..f0b4e37c7 100644 --- a/internal/notify/notifiers/sp_email.go +++ b/internal/notify/notifiers/sp_email.go @@ -11,20 +11,20 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeEmail, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForEmail{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForEmail{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := email.NewNotifierProvider(&email.NotifierProviderConfig{ - SmtpHost: access.SmtpHost, - SmtpPort: access.SmtpPort, - SmtpTls: access.SmtpTls, - Username: access.Username, - Password: access.Password, - SenderAddress: access.SenderAddress, - SenderName: access.SenderName, - ReceiverAddress: xmaps.GetOrDefaultString(options.ProviderConfig, "receiverAddress", access.ReceiverAddress), + SmtpHost: credentials.SmtpHost, + SmtpPort: credentials.SmtpPort, + SmtpTls: credentials.SmtpTls, + Username: credentials.Username, + Password: credentials.Password, + SenderAddress: credentials.SenderAddress, + SenderName: credentials.SenderName, + ReceiverAddress: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "receiverAddress", credentials.ReceiverAddress), }) return provider, err }); err != nil { diff --git a/internal/notify/notifiers/sp_larkbot.go b/internal/notify/notifiers/sp_larkbot.go index e68a90f6d..bce1c1734 100644 --- a/internal/notify/notifiers/sp_larkbot.go +++ b/internal/notify/notifiers/sp_larkbot.go @@ -11,13 +11,13 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeLarkBot, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForLarkBot{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForLarkBot{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := larkbot.NewNotifierProvider(&larkbot.NotifierProviderConfig{ - WebhookUrl: access.WebhookUrl, + WebhookUrl: credentials.WebhookUrl, }) return provider, err }); err != nil { diff --git a/internal/notify/notifiers/sp_mattermost.go b/internal/notify/notifiers/sp_mattermost.go index fa7c15e1e..89b91a46c 100644 --- a/internal/notify/notifiers/sp_mattermost.go +++ b/internal/notify/notifiers/sp_mattermost.go @@ -11,16 +11,16 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeMattermost, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForMattermost{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForMattermost{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := mattermost.NewNotifierProvider(&mattermost.NotifierProviderConfig{ - ServerUrl: access.ServerUrl, - Username: access.Username, - Password: access.Password, - ChannelId: xmaps.GetOrDefaultString(options.ProviderConfig, "channelId", access.ChannelId), + ServerUrl: credentials.ServerUrl, + Username: credentials.Username, + Password: credentials.Password, + ChannelId: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "channelId", credentials.ChannelId), }) return provider, err }); err != nil { diff --git a/internal/notify/notifiers/sp_slackbot.go b/internal/notify/notifiers/sp_slackbot.go index aebaaa24d..ab3c355b8 100644 --- a/internal/notify/notifiers/sp_slackbot.go +++ b/internal/notify/notifiers/sp_slackbot.go @@ -11,14 +11,14 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeSlackBot, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForSlackBot{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForSlackBot{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := slackbot.NewNotifierProvider(&slackbot.NotifierProviderConfig{ - BotToken: access.BotToken, - ChannelId: xmaps.GetOrDefaultString(options.ProviderConfig, "channelId", access.ChannelId), + BotToken: credentials.BotToken, + ChannelId: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "channelId", credentials.ChannelId), }) return provider, err }); err != nil { diff --git a/internal/notify/notifiers/sp_telegrambot.go b/internal/notify/notifiers/sp_telegrambot.go index 74d71e0d6..e366b912c 100644 --- a/internal/notify/notifiers/sp_telegrambot.go +++ b/internal/notify/notifiers/sp_telegrambot.go @@ -11,14 +11,14 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeTelegramBot, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForTelegramBot{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForTelegramBot{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := telegrambot.NewNotifierProvider(&telegrambot.NotifierProviderConfig{ - BotToken: access.BotToken, - ChatId: xmaps.GetOrDefaultInt64(options.ProviderConfig, "chatId", access.ChatId), + BotToken: credentials.BotToken, + ChatId: xmaps.GetOrDefaultInt64(options.ProviderExtendedConfig, "chatId", credentials.ChatId), }) return provider, err }); err != nil { diff --git a/internal/notify/notifiers/sp_webhook.go b/internal/notify/notifiers/sp_webhook.go index c36e13e66..db0c44128 100644 --- a/internal/notify/notifiers/sp_webhook.go +++ b/internal/notify/notifiers/sp_webhook.go @@ -13,13 +13,13 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeWebhook, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForWebhook{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForWebhook{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } mergedHeaders := make(map[string]string) - if defaultHeadersString := access.HeadersString; defaultHeadersString != "" { + if defaultHeadersString := credentials.HeadersString; defaultHeadersString != "" { h, err := xhttp.ParseHeaders(defaultHeadersString) if err != nil { return nil, fmt.Errorf("failed to parse webhook headers: %w", err) @@ -28,7 +28,7 @@ func init() { mergedHeaders[http.CanonicalHeaderKey(key)] = h.Get(key) } } - if extendedHeadersString := xmaps.GetString(options.ProviderConfig, "headers"); extendedHeadersString != "" { + if extendedHeadersString := xmaps.GetString(options.ProviderExtendedConfig, "headers"); extendedHeadersString != "" { h, err := xhttp.ParseHeaders(extendedHeadersString) if err != nil { return nil, fmt.Errorf("failed to parse webhook headers: %w", err) @@ -39,11 +39,11 @@ func init() { } provider, err := webhook.NewNotifierProvider(&webhook.NotifierProviderConfig{ - WebhookUrl: access.Url, - WebhookData: xmaps.GetOrDefaultString(options.ProviderConfig, "webhookData", access.DataString), - Method: access.Method, + WebhookUrl: credentials.Url, + WebhookData: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "webhookData", credentials.DataString), + Method: credentials.Method, Headers: mergedHeaders, - AllowInsecureConnections: access.AllowInsecureConnections, + AllowInsecureConnections: credentials.AllowInsecureConnections, }) return provider, err }); err != nil { diff --git a/internal/notify/notifiers/sp_wecombot.go b/internal/notify/notifiers/sp_wecombot.go index 4701d6fba..6904d7633 100644 --- a/internal/notify/notifiers/sp_wecombot.go +++ b/internal/notify/notifiers/sp_wecombot.go @@ -11,13 +11,13 @@ import ( func init() { if err := Registries.Register(domain.NotificationProviderTypeWeComBot, func(options *ProviderFactoryOptions) (core.Notifier, error) { - access := domain.AccessConfigForWeComBot{} - if err := xmaps.Populate(options.AccessConfig, &access); err != nil { + credentials := domain.AccessConfigForWeComBot{} + if err := xmaps.Populate(options.ProviderAccessConfig, &credentials); err != nil { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } provider, err := wecombot.NewNotifierProvider(&wecombot.NotifierProviderConfig{ - WebhookUrl: access.WebhookUrl, + WebhookUrl: credentials.WebhookUrl, }) return provider, err }); err != nil { diff --git a/internal/notify/providers.go b/internal/notify/providers.go index 3d2320859..f2a6bbf01 100644 --- a/internal/notify/providers.go +++ b/internal/notify/providers.go @@ -7,9 +7,9 @@ import ( ) type notifierProviderOptions struct { - Provider domain.NotificationProviderType - ProviderAccessConfig map[string]any - ProviderServiceConfig map[string]any + Provider domain.NotificationProviderType + ProviderAccessConfig map[string]any + ProviderExtendedConfig map[string]any } func createNotifierProvider(options *notifierProviderOptions) (core.Notifier, error) { @@ -19,7 +19,7 @@ func createNotifierProvider(options *notifierProviderOptions) (core.Notifier, er } return provider(¬ifiers.ProviderFactoryOptions{ - AccessConfig: options.ProviderAccessConfig, - ProviderConfig: options.ProviderServiceConfig, + ProviderAccessConfig: options.ProviderAccessConfig, + ProviderExtendedConfig: options.ProviderExtendedConfig, }) }