From eef2ab9a5e6c87e140e0a311a0f69b40d9024d72 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 4 Jun 2026 01:08:23 +0800 Subject: [PATCH] refactor: unify type definitions of core providers --- .tmp_provider_refactor_files.txt | 132 ++++++++++++++++++ internal/certacme/certifiers/sp_35cn.go | 4 +- internal/certacme/certifiers/sp_51dnscom.go | 4 +- internal/certacme/certifiers/sp_acmedns.go | 4 +- .../certacme/certifiers/sp_acmehttpreq.go | 4 +- .../certacme/certifiers/sp_akamai_edgedns.go | 4 +- internal/certacme/certifiers/sp_aliyun_dns.go | 4 +- internal/certacme/certifiers/sp_aliyun_esa.go | 4 +- internal/certacme/certifiers/sp_arvancloud.go | 4 +- .../certacme/certifiers/sp_aws_lightsail.go | 4 +- .../certacme/certifiers/sp_aws_route53.go | 4 +- internal/certacme/certifiers/sp_azure_dns.go | 4 +- .../certacme/certifiers/sp_baiducloud_dns.go | 4 +- internal/certacme/certifiers/sp_beget.go | 4 +- internal/certacme/certifiers/sp_bookmyname.go | 4 +- internal/certacme/certifiers/sp_bunny.go | 4 +- .../certacme/certifiers/sp_byteplus_dns.go | 4 +- internal/certacme/certifiers/sp_cloudflare.go | 4 +- internal/certacme/certifiers/sp_cloudns.go | 4 +- .../certacme/certifiers/sp_cmcccloud_dns.go | 4 +- internal/certacme/certifiers/sp_conohavps.go | 8 +- internal/certacme/certifiers/sp_constellix.go | 4 +- internal/certacme/certifiers/sp_cpanel.go | 4 +- .../certifiers/sp_ctcccloud_smartdns.go | 4 +- internal/certacme/certifiers/sp_desec.go | 4 +- .../certacme/certifiers/sp_digitalocean.go | 4 +- internal/certacme/certifiers/sp_dnsexit.go | 4 +- internal/certacme/certifiers/sp_dnsla.go | 4 +- .../certacme/certifiers/sp_dnsmadeeasy.go | 4 +- internal/certacme/certifiers/sp_duckdns.go | 4 +- internal/certacme/certifiers/sp_dynadot.go | 4 +- internal/certacme/certifiers/sp_dynu.go | 4 +- internal/certacme/certifiers/sp_dynv6.go | 4 +- internal/certacme/certifiers/sp_ftp.go | 4 +- internal/certacme/certifiers/sp_gandinet.go | 4 +- internal/certacme/certifiers/sp_gcore.go | 4 +- internal/certacme/certifiers/sp_gname.go | 4 +- internal/certacme/certifiers/sp_godaddy.go | 4 +- internal/certacme/certifiers/sp_hetzner.go | 4 +- internal/certacme/certifiers/sp_hostingde.go | 4 +- internal/certacme/certifiers/sp_hostinger.go | 4 +- .../certacme/certifiers/sp_huaweicloud_dns.go | 4 +- internal/certacme/certifiers/sp_infomaniak.go | 4 +- internal/certacme/certifiers/sp_ionos.go | 4 +- .../certacme/certifiers/sp_jdcloud_dns.go | 4 +- internal/certacme/certifiers/sp_linode.go | 4 +- internal/certacme/certifiers/sp_local.go | 4 +- internal/certacme/certifiers/sp_namecheap.go | 4 +- internal/certacme/certifiers/sp_namedotcom.go | 4 +- internal/certacme/certifiers/sp_namesilo.go | 4 +- internal/certacme/certifiers/sp_netcup.go | 4 +- internal/certacme/certifiers/sp_netlify.go | 4 +- internal/certacme/certifiers/sp_ns1.go | 4 +- internal/certacme/certifiers/sp_ovhcloud.go | 4 +- internal/certacme/certifiers/sp_porkbun.go | 4 +- internal/certacme/certifiers/sp_powerdns.go | 4 +- .../certacme/certifiers/sp_qingcloud_dns.go | 4 +- internal/certacme/certifiers/sp_rainyun.go | 4 +- internal/certacme/certifiers/sp_regru.go | 4 +- internal/certacme/certifiers/sp_rfc2136.go | 4 +- internal/certacme/certifiers/sp_rucenter.go | 4 +- internal/certacme/certifiers/sp_s3.go | 4 +- internal/certacme/certifiers/sp_spaceship.go | 4 +- internal/certacme/certifiers/sp_ssh.go | 10 +- .../certacme/certifiers/sp_technitiumdns.go | 4 +- .../certifiers/sp_tencentcloud_dns.go | 4 +- .../certacme/certifiers/sp_tencentcloud_eo.go | 4 +- internal/certacme/certifiers/sp_todaynic.go | 4 +- .../certacme/certifiers/sp_ucloud_udnr.go | 4 +- internal/certacme/certifiers/sp_vercel.go | 4 +- internal/certacme/certifiers/sp_volcengine.go | 4 +- internal/certacme/certifiers/sp_vultr.go | 4 +- internal/certacme/certifiers/sp_westcn.go | 4 +- internal/certacme/certifiers/sp_xinnet.go | 4 +- internal/certmgmt/deployers/sp_1panel.go | 4 +- .../certmgmt/deployers/sp_1panel_console.go | 4 +- internal/certmgmt/deployers/sp_aliyun_alb.go | 4 +- .../certmgmt/deployers/sp_aliyun_apigw.go | 4 +- internal/certmgmt/deployers/sp_aliyun_cas.go | 4 +- .../certmgmt/deployers/sp_aliyun_casdeploy.go | 4 +- internal/certmgmt/deployers/sp_aliyun_cdn.go | 4 +- internal/certmgmt/deployers/sp_aliyun_clb.go | 4 +- internal/certmgmt/deployers/sp_aliyun_dcdn.go | 4 +- .../certmgmt/deployers/sp_aliyun_ddospro.go | 4 +- internal/certmgmt/deployers/sp_aliyun_esa.go | 4 +- .../certmgmt/deployers/sp_aliyun_esasaas.go | 4 +- internal/certmgmt/deployers/sp_aliyun_fc.go | 4 +- internal/certmgmt/deployers/sp_aliyun_ga.go | 4 +- internal/certmgmt/deployers/sp_aliyun_live.go | 4 +- internal/certmgmt/deployers/sp_aliyun_nlb.go | 4 +- internal/certmgmt/deployers/sp_aliyun_oss.go | 4 +- internal/certmgmt/deployers/sp_aliyun_vod.go | 4 +- internal/certmgmt/deployers/sp_aliyun_waf.go | 4 +- internal/certmgmt/deployers/sp_apisix.go | 4 +- internal/certmgmt/deployers/sp_aws_acm.go | 4 +- .../certmgmt/deployers/sp_aws_cloudfront.go | 4 +- internal/certmgmt/deployers/sp_aws_iam.go | 4 +- .../certmgmt/deployers/sp_azure_keyvault.go | 4 +- .../deployers/sp_baiducloud_appblb.go | 4 +- .../certmgmt/deployers/sp_baiducloud_blb.go | 4 +- .../certmgmt/deployers/sp_baiducloud_cdn.go | 4 +- .../certmgmt/deployers/sp_baiducloud_cert.go | 4 +- internal/certmgmt/deployers/sp_baishan_cdn.go | 4 +- internal/certmgmt/deployers/sp_baotapanel.go | 4 +- .../deployers/sp_baotapanel_console.go | 4 +- .../certmgmt/deployers/sp_baotapanelgo.go | 4 +- .../deployers/sp_baotapanelgo_console.go | 4 +- internal/certmgmt/deployers/sp_baotawaf.go | 4 +- .../certmgmt/deployers/sp_baotawaf_console.go | 4 +- internal/certmgmt/deployers/sp_bunny_cdn.go | 4 +- .../certmgmt/deployers/sp_byteplus_cdn.go | 4 +- .../deployers/sp_byteplus_certcenter.go | 4 +- .../deployers/sp_byteplus_medialive.go | 4 +- .../certmgmt/deployers/sp_byteplus_tos.go | 4 +- internal/certmgmt/deployers/sp_cachefly.go | 4 +- internal/certmgmt/deployers/sp_cdnfly.go | 4 +- internal/certmgmt/deployers/sp_cpanel.go | 4 +- .../certmgmt/deployers/sp_ctcccloud_ao.go | 4 +- .../certmgmt/deployers/sp_ctcccloud_cdn.go | 4 +- .../certmgmt/deployers/sp_ctcccloud_cms.go | 4 +- .../certmgmt/deployers/sp_ctcccloud_elb.go | 4 +- .../certmgmt/deployers/sp_ctcccloud_faas.go | 4 +- .../certmgmt/deployers/sp_ctcccloud_icdn.go | 4 +- .../certmgmt/deployers/sp_ctcccloud_lvdn.go | 4 +- .../certmgmt/deployers/sp_dogecloud_cdn.go | 4 +- internal/certmgmt/deployers/sp_dokploy.go | 4 +- internal/certmgmt/deployers/sp_flexcdn.go | 4 +- internal/certmgmt/deployers/sp_flyio.go | 4 +- internal/certmgmt/deployers/sp_ftp.go | 6 +- internal/certmgmt/deployers/sp_gcore_cdn.go | 4 +- internal/certmgmt/deployers/sp_goedge.go | 4 +- .../certmgmt/deployers/sp_huaweicloud_aad.go | 4 +- .../certmgmt/deployers/sp_huaweicloud_apig.go | 4 +- .../certmgmt/deployers/sp_huaweicloud_cdn.go | 4 +- .../certmgmt/deployers/sp_huaweicloud_elb.go | 4 +- .../certmgmt/deployers/sp_huaweicloud_live.go | 4 +- .../certmgmt/deployers/sp_huaweicloud_obs.go | 4 +- .../certmgmt/deployers/sp_huaweicloud_scm.go | 4 +- .../certmgmt/deployers/sp_huaweicloud_waf.go | 4 +- internal/certmgmt/deployers/sp_jdcloud_alb.go | 4 +- internal/certmgmt/deployers/sp_jdcloud_cdn.go | 4 +- .../certmgmt/deployers/sp_jdcloud_live.go | 4 +- internal/certmgmt/deployers/sp_jdcloud_ssl.go | 4 +- internal/certmgmt/deployers/sp_jdcloud_vod.go | 4 +- internal/certmgmt/deployers/sp_jdcloud_waf.go | 4 +- internal/certmgmt/deployers/sp_kong.go | 4 +- internal/certmgmt/deployers/sp_ksyun_cdn.go | 4 +- internal/certmgmt/deployers/sp_ksyun_slb.go | 4 +- .../deployers/sp_kubernetes_secret.go | 4 +- internal/certmgmt/deployers/sp_lecdn.go | 4 +- internal/certmgmt/deployers/sp_local.go | 6 +- internal/certmgmt/deployers/sp_mohua_mvh.go | 4 +- internal/certmgmt/deployers/sp_netlify.go | 4 +- .../deployers/sp_nginxproxymanager.go | 4 +- internal/certmgmt/deployers/sp_proxmoxve.go | 4 +- internal/certmgmt/deployers/sp_qiniu_cdn.go | 4 +- internal/certmgmt/deployers/sp_qiniu_kodo.go | 4 +- internal/certmgmt/deployers/sp_qiniu_pili.go | 4 +- .../certmgmt/deployers/sp_rainyun_rcdn.go | 4 +- .../deployers/sp_rainyun_sslcenter.go | 4 +- internal/certmgmt/deployers/sp_ratpanel.go | 4 +- .../certmgmt/deployers/sp_ratpanel_console.go | 4 +- internal/certmgmt/deployers/sp_s3.go | 6 +- internal/certmgmt/deployers/sp_safeline.go | 4 +- internal/certmgmt/deployers/sp_samwaf.go | 4 +- internal/certmgmt/deployers/sp_ssh.go | 12 +- internal/certmgmt/deployers/sp_synologydsm.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_cdn.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_clb.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_cos.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_css.go | 4 +- .../deployers/sp_tencentcloud_ecdn.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_eo.go | 4 +- .../deployers/sp_tencentcloud_gaap.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_scf.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_ssl.go | 4 +- .../deployers/sp_tencentcloud_ssldeploy.go | 4 +- .../deployers/sp_tencentcloud_sslupdate.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_vod.go | 4 +- .../certmgmt/deployers/sp_tencentcloud_waf.go | 4 +- internal/certmgmt/deployers/sp_ucloud_ualb.go | 4 +- internal/certmgmt/deployers/sp_ucloud_ucdn.go | 4 +- internal/certmgmt/deployers/sp_ucloud_uclb.go | 4 +- .../certmgmt/deployers/sp_ucloud_uewaf.go | 4 +- .../certmgmt/deployers/sp_ucloud_upathx.go | 4 +- internal/certmgmt/deployers/sp_ucloud_us3.go | 4 +- .../certmgmt/deployers/sp_unicloud_webhost.go | 4 +- internal/certmgmt/deployers/sp_upyun_cdn.go | 4 +- internal/certmgmt/deployers/sp_upyun_file.go | 4 +- internal/certmgmt/deployers/sp_vercel.go | 4 +- .../certmgmt/deployers/sp_volcengine_alb.go | 4 +- .../certmgmt/deployers/sp_volcengine_apig.go | 4 +- .../certmgmt/deployers/sp_volcengine_cdn.go | 4 +- .../deployers/sp_volcengine_certcenter.go | 4 +- .../certmgmt/deployers/sp_volcengine_clb.go | 4 +- .../certmgmt/deployers/sp_volcengine_dcdn.go | 4 +- .../deployers/sp_volcengine_imagex.go | 4 +- .../certmgmt/deployers/sp_volcengine_live.go | 4 +- .../certmgmt/deployers/sp_volcengine_tos.go | 4 +- .../certmgmt/deployers/sp_volcengine_vod.go | 4 +- .../certmgmt/deployers/sp_volcengine_waf.go | 4 +- internal/certmgmt/deployers/sp_wangsu_cdn.go | 4 +- .../certmgmt/deployers/sp_wangsu_cdnpro.go | 4 +- .../deployers/sp_wangsu_certificate.go | 4 +- internal/certmgmt/deployers/sp_webhook.go | 4 +- .../certmgmt/deployers/sp_zenlayer_cdn.go | 4 +- internal/certmgmt/deployers/sp_zenlayer_ga.go | 4 +- internal/notify/notifiers/sp_dingtalkbot.go | 4 +- internal/notify/notifiers/sp_discordbot.go | 4 +- internal/notify/notifiers/sp_email.go | 3 +- internal/notify/notifiers/sp_larkbot.go | 4 +- internal/notify/notifiers/sp_mattermost.go | 4 +- internal/notify/notifiers/sp_slackbot.go | 4 +- internal/notify/notifiers/sp_telegrambot.go | 4 +- internal/notify/notifiers/sp_webhook.go | 4 +- internal/notify/notifiers/sp_wecombot.go | 4 +- .../certifier/challengers/dns01/35cn/35cn.go | 4 +- .../challengers/dns01/51dnscom/51dnscom.go | 4 +- .../challengers/dns01/acmedns/acmedns.go | 4 +- .../dns01/acmehttpreq/acmehttpreq.go | 4 +- .../dns01/akamai-edgedns/akamai_edgedns.go | 5 +- .../dns01/aliyun-esa/aliyun_esa.go | 4 +- .../challengers/dns01/aliyun/aliyun.go | 4 +- .../dns01/arvancloud/arvancloud.go | 4 +- .../dns01/aws-lightsail/aws_lightsail.go | 4 +- .../dns01/aws-lightsail/internal/lego.go | 2 +- .../dns01/aws-route53/aws_route53.go | 4 +- .../challengers/dns01/azure-dns/azure_dns.go | 4 +- .../dns01/baiducloud/baiducloud.go | 4 +- .../challengers/dns01/beget/beget.go | 4 +- .../dns01/bookmyname/bookmyname.go | 4 +- .../challengers/dns01/bunny/bunny.go | 4 +- .../challengers/dns01/byteplus/byteplus.go | 4 +- .../dns01/byteplus/internal/lego.go | 2 +- .../dns01/cloudflare/cloudflare.go | 4 +- .../challengers/dns01/cloudns/cloudns.go | 4 +- .../challengers/dns01/cmcccloud/cmcccloud.go | 4 +- .../dns01/conohavpsv2/conohavpsv2.go | 4 +- .../dns01/conohavpsv3/conohavpsv3.go | 4 +- .../dns01/conohavpsv3/internal/lego.go | 2 +- .../dns01/constellix/constellix.go | 4 +- .../challengers/dns01/cpanel/cpanel.go | 4 +- .../challengers/dns01/ctcccloud/ctcccloud.go | 4 +- .../challengers/dns01/desec/desec.go | 4 +- .../dns01/digitalocean/digitalocean.go | 4 +- .../challengers/dns01/dnsexit/dnsexit.go | 4 +- .../challengers/dns01/dnsla/dnsla.go | 4 +- .../dns01/dnsmadeeasy/dnsmadeeasy.go | 4 +- .../challengers/dns01/duckdns/duckdns.go | 4 +- .../challengers/dns01/dynadot/dynadot.go | 4 +- .../certifier/challengers/dns01/dynu/dynu.go | 4 +- .../challengers/dns01/dynv6/dynv6.go | 4 +- .../challengers/dns01/gandinet/gandinet.go | 4 +- .../challengers/dns01/gcore/gcore.go | 4 +- .../challengers/dns01/gname/gname.go | 4 +- .../challengers/dns01/godaddy/godaddy.go | 4 +- .../challengers/dns01/hetzner/hetzner.go | 4 +- .../challengers/dns01/hostingde/hostingde.go | 4 +- .../challengers/dns01/hostinger/hostinger.go | 4 +- .../dns01/huaweicloud/huaweicloud.go | 4 +- .../dns01/infomaniak/infomaniak.go | 4 +- .../challengers/dns01/ionos/ionos.go | 4 +- .../challengers/dns01/jdcloud/jdcloud.go | 4 +- .../challengers/dns01/linode/linode.go | 4 +- .../challengers/dns01/namecheap/namecheap.go | 4 +- .../dns01/namedotcom/namedotcom.go | 4 +- .../challengers/dns01/namesilo/namesilo.go | 4 +- .../challengers/dns01/netcup/netcup.go | 4 +- .../challengers/dns01/netlify/netlify.go | 4 +- .../certifier/challengers/dns01/ns1/ns1.go | 4 +- .../challengers/dns01/ovhcloud/ovhcloud.go | 4 +- .../challengers/dns01/porkbun/porkbun.go | 4 +- .../challengers/dns01/powerdns/powerdns.go | 4 +- .../challengers/dns01/qingcloud/qingcloud.go | 4 +- .../challengers/dns01/rainyun/rainyun.go | 4 +- .../challengers/dns01/regru/regru.go | 4 +- .../challengers/dns01/rfc2136/rfc2136.go | 4 +- .../challengers/dns01/rucenter/rucenter.go | 4 +- .../challengers/dns01/spaceship/spaceship.go | 4 +- .../dns01/technitiumdns/technitiumdns.go | 4 +- .../dns01/tencentcloud-eo/tencentcloud_eo.go | 4 +- .../dns01/tencentcloud/tencentcloud.go | 4 +- .../challengers/dns01/todaynic/todaynic.go | 4 +- .../challengers/dns01/ucloud/ucloud.go | 4 +- .../challengers/dns01/vercel/vercel.go | 4 +- .../dns01/volcengine/volcengine.go | 4 +- .../challengers/dns01/vultr/vultr.go | 4 +- .../challengers/dns01/westcn/westcn.go | 4 +- .../challengers/dns01/xinnet/xinnet.go | 4 +- .../certifier/challengers/http01/ftp/ftp.go | 79 ++--------- .../challengers/http01/ftp/internal/lego.go | 103 ++++++++++++++ .../challengers/http01/local/local.go | 4 +- .../challengers/http01/s3/internal/lego.go | 88 ++++++++++++ .../certifier/challengers/http01/s3/s3.go | 63 ++------- .../challengers/http01/ssh/internal/ssh.go | 108 ++++++++++++++ .../certifier/challengers/http01/ssh/ssh.go | 91 +++--------- .../certifier/{challenger.go => typealias.go} | 0 pkg/core/certmgr/errors.go | 10 -- pkg/core/certmgr/provider.go | 11 -- pkg/core/certmgr/providers/1panel/1panel.go | 22 +-- .../providers/aliyun-cas/aliyun_cas.go | 21 ++- .../providers/aliyun-slb/aliyun_slb.go | 21 ++- pkg/core/certmgr/providers/aws-acm/aws_acm.go | 20 ++- pkg/core/certmgr/providers/aws-iam/aws_iam.go | 20 ++- .../azure-keyvault/azure_keyvault.go | 22 +-- .../baiducloud-cert/baiducloud_cert.go | 20 ++- .../providers/baishan-cdn/baishan_cdn.go | 18 ++- .../providers/byteplus-cdn/byteplus_cdn.go | 20 ++- .../byteplus_certcenter.go | 19 ++- .../byteplus-medialive/byteplus_medialive.go | 20 ++- .../byteplus_medialive_test.go | 2 +- .../providers/ctcccloud-ao/ctcccloud_ao.go | 20 ++- .../providers/ctcccloud-cdn/ctcccloud_cdn.go | 20 ++- .../providers/ctcccloud-cms/ctcccloud_cms.go | 20 ++- .../providers/ctcccloud-elb/ctcccloud_elb.go | 20 ++- .../ctcccloud-icdn/ctcccloud_icdn.go | 20 ++- .../ctcccloud-lvdn/ctcccloud_lvdn.go | 20 ++- .../certmgr/providers/dogecloud/dogecloud.go | 18 ++- pkg/core/certmgr/providers/dokploy/dokploy.go | 20 ++- .../certmgr/providers/gcore-cdn/gcore_cdn.go | 18 ++- .../huaweicloud-elb/huaweicloud_elb.go | 21 ++- .../huaweicloud-scm/huaweicloud_scm.go | 21 ++- .../huaweicloud-waf/huaweicloud_waf.go | 21 ++- .../providers/jdcloud-ssl/jdcloud_ssl.go | 21 ++- .../nginxproxymanager/nginxproxymanager.go | 20 ++- .../providers/qiniu-sslcert/qiniu_sslcert.go | 20 ++- .../rainyun-sslcenter/rainyun_sslcenter.go | 20 ++- .../tencentcloud-ssl/tencentcloud_ssl.go | 19 ++- .../providers/ucloud-ulb/ucloud_ulb.go | 22 +-- .../providers/ucloud-upathx/ucloud_upathx.go | 22 +-- .../providers/ucloud-ussl/ucloud_ussl.go | 22 +-- .../certmgr/providers/upyun-ssl/upyun_ssl.go | 18 ++- .../volcengine-cdn/volcengine_cdn.go | 21 ++- .../volcengine_certcenter.go | 19 ++- .../volcengine-live/volcengine_live.go | 20 ++- .../wangsu-certificate/wangsu_certificate.go | 20 ++- .../providers/zenlayer-cdn/zenlayer_cdn.go | 20 ++- .../providers/zenlayer-ga/zenlayer_ga.go | 20 ++- pkg/core/certmgr/typealias.go | 11 ++ pkg/core/deployer/provider.go | 9 -- .../1panel-console/1panel_console.go | 13 +- pkg/core/deployer/providers/1panel/1panel.go | 20 +-- .../providers/aliyun-alb/aliyun_alb.go | 21 +-- .../providers/aliyun-apigw/aliyun_apigw.go | 21 +-- .../aliyun-cas-deploy/aliyun_cas_deploy.go | 21 +-- .../providers/aliyun-cas/aliyun_cas.go | 20 +-- .../providers/aliyun-cdn/aliyun_cdn.go | 21 +-- .../providers/aliyun-clb/aliyun_clb.go | 21 +-- .../providers/aliyun-dcdn/aliyun_dcdn.go | 21 +-- .../aliyun-ddospro/aliyun_ddospro.go | 21 +-- .../aliyun-esa-saas/aliyun_esasaas.go | 21 +-- .../providers/aliyun-esa/aliyun_esa.go | 23 +-- .../deployer/providers/aliyun-fc/aliyun_fc.go | 14 +- .../deployer/providers/aliyun-ga/aliyun_ga.go | 21 +-- .../providers/aliyun-live/aliyun_live.go | 14 +- .../providers/aliyun-nlb/aliyun_nlb.go | 21 +-- .../providers/aliyun-oss/aliyun_oss.go | 13 +- .../providers/aliyun-vod/aliyun_vod.go | 21 +-- .../providers/aliyun-waf/aliyun_waf.go | 21 +-- pkg/core/deployer/providers/apisix/apisix.go | 13 +- .../deployer/providers/aws-acm/aws_acm.go | 20 +-- .../aws-cloudfront/aws_cloudfront.go | 26 ++-- .../deployer/providers/aws-iam/aws_iam.go | 20 +-- .../azure-keyvault/azure_keyvault.go | 20 +-- .../baiducloud-appblb/baiducloud_appblb.go | 20 +-- .../baiducloud-blb/baiducloud_blb.go | 20 +-- .../baiducloud-cdn/baiducloud_cdn.go | 13 +- .../baiducloud-cert/baiducloud_cert.go | 20 +-- .../providers/baishan-cdn/baishan_cdn.go | 20 +-- .../baotapanel-console/baotapanel_console.go | 13 +- .../providers/baotapanel/baotapanel.go | 13 +- .../baotapanelgo_console.go | 13 +- .../providers/baotapanelgo/baotapanelgo.go | 13 +- .../baotawaf-console/baotawaf_console.go | 13 +- .../deployer/providers/baotawaf/baotawaf.go | 13 +- .../deployer/providers/bunny-cdn/bunny_cdn.go | 13 +- .../providers/byteplus-cdn/byteplus_cdn.go | 20 +-- .../byteplus_certcenter.go | 20 +-- .../byteplus-medialive/byteplus_medialive.go | 20 +-- .../providers/byteplus-tos/byteplus_tos.go | 20 +-- .../deployer/providers/cachefly/cachefly.go | 13 +- pkg/core/deployer/providers/cdnfly/cdnfly.go | 13 +- pkg/core/deployer/providers/cpanel/cpanel.go | 13 +- .../providers/ctcccloud-ao/ctcccloud_ao.go | 20 +-- .../providers/ctcccloud-cdn/ctcccloud_cdn.go | 20 +-- .../providers/ctcccloud-cms/ctcccloud_cms.go | 20 +-- .../providers/ctcccloud-elb/ctcccloud_elb.go | 20 +-- .../ctcccloud-faas/ctcccloud_faas.go | 18 ++- .../ctcccloud-icdn/ctcccloud_icdn.go | 20 +-- .../ctcccloud-lvdn/ctcccloud_lvdn.go | 20 +-- .../providers/dogecloud-cdn/dogecloud_cdn.go | 20 +-- .../deployer/providers/dokploy/dokploy.go | 20 +-- .../deployer/providers/flexcdn/flexcdn.go | 13 +- pkg/core/deployer/providers/flyio/flyio.go | 13 +- pkg/core/deployer/providers/ftp/ftp.go | 13 +- .../deployer/providers/gcore-cdn/gcore_cdn.go | 20 +-- pkg/core/deployer/providers/goedge/goedge.go | 13 +- .../huaweicloud-aad/huaweicloud_aad.go | 14 +- .../huaweicloud-apig/huaweicloud_apig.go | 14 +- .../huaweicloud-cdn/huaweicloud_cdn.go | 21 +-- .../huaweicloud-elb/huaweicloud_elb.go | 21 +-- .../huaweicloud-live/huaweicloud_live.go | 21 +-- .../huaweicloud-obs/huaweicloud_obs.go | 13 +- .../huaweicloud-scm/huaweicloud_scm.go | 20 +-- .../huaweicloud-waf/huaweicloud_waf.go | 21 +-- .../providers/jdcloud-alb/jdcloud_alb.go | 21 +-- .../providers/jdcloud-cdn/jdcloud_cdn.go | 21 +-- .../providers/jdcloud-live/jdcloud_live.go | 14 +- .../providers/jdcloud-ssl/jdcloud_ssl.go | 20 +-- .../providers/jdcloud-vod/jdcloud_vod.go | 14 +- .../providers/jdcloud-waf/jdcloud_waf.go | 21 +-- .../providers/k8s-secret/k8s_secret.go | 14 +- pkg/core/deployer/providers/kong/kong.go | 13 +- .../deployer/providers/ksyun-cdn/ksyun_cdn.go | 13 +- .../deployer/providers/ksyun-slb/ksyun_slb.go | 13 +- pkg/core/deployer/providers/lecdn/lecdn.go | 13 +- pkg/core/deployer/providers/local/local.go | 13 +- .../deployer/providers/mohua-mvh/mohua_mvh.go | 13 +- .../deployer/providers/netlify/netlify.go | 13 +- .../nginxproxymanager/nginxproxymanager.go | 20 +-- .../deployer/providers/proxmoxve/proxmoxve.go | 13 +- .../deployer/providers/qiniu-cdn/qiniu_cdn.go | 20 +-- .../providers/qiniu-kodo/qiniu_kodo.go | 20 +-- .../providers/qiniu-pili/qiniu_pili.go | 20 +-- .../providers/rainyun-rcdn/rainyun_rcdn.go | 20 +-- .../rainyun-sslcenter/rainyun_sslcenter.go | 20 +-- .../ratpanel-console/ratpanel_console.go | 13 +- .../deployer/providers/ratpanel/ratpanel.go | 13 +- pkg/core/deployer/providers/s3/s3.go | 13 +- .../deployer/providers/safeline/safeline.go | 13 +- pkg/core/deployer/providers/samwaf/samwaf.go | 13 +- pkg/core/deployer/providers/ssh/ssh.go | 13 +- .../providers/synologydsm/synologydsm.go | 13 +- .../tencentcloud-cdn/tencentcloud_cdn.go | 21 +-- .../tencentcloud-clb/tencentcloud_clb.go | 21 +-- .../tencentcloud-cos/tencentcloud_cos.go | 23 +-- .../tencentcloud-css/tencentcloud_css.go | 21 +-- .../tencentcloud-ecdn/tencentcloud_ecdn.go | 21 +-- .../tencentcloud-eo/tencentcloud_eo.go | 21 +-- .../tencentcloud-gaap/tencentcloud_gaap.go | 21 +-- .../tencentcloud-scf/tencentcloud_scf.go | 21 +-- .../tencentcloud_ssl_deploy.go | 21 +-- .../tencentcloud_ssl_update.go | 21 +-- .../tencentcloud-ssl/tencentcloud_ssl.go | 20 +-- .../tencentcloud-vod/tencentcloud_vod.go | 21 +-- .../tencentcloud-waf/tencentcloud_waf.go | 21 +-- .../providers/ucloud-ualb/ucloud_ualb.go | 20 +-- .../providers/ucloud-ucdn/ucloud_ucdn.go | 20 +-- .../providers/ucloud-uclb/ucloud_uclb.go | 20 +-- .../providers/ucloud-uewaf/ucloud_uewaf.go | 13 +- .../providers/ucloud-upathx/ucloud_upathx.go | 20 +-- .../providers/ucloud-us3/ucloud_us3.go | 20 +-- .../unicloud-webhost/unicloud_webhost.go | 13 +- .../deployer/providers/upyun-cdn/upyun_cdn.go | 20 +-- .../providers/upyun-file/upyun_file.go | 20 +-- pkg/core/deployer/providers/vercel/vercel.go | 13 +- .../volcengine-alb/volcengine_alb.go | 21 +-- .../volcengine-apig/volcengine_apig.go | 21 +-- .../volcengine-cdn/volcengine_cdn.go | 21 +-- .../volcengine_certcenter.go | 20 +-- .../volcengine-clb/volcengine_clb.go | 21 +-- .../volcengine-dcdn/volcengine_dcdn.go | 21 +-- .../volcengine-imagex/volcengine_imagex.go | 20 +-- .../volcengine-live/volcengine_live.go | 20 +-- .../volcengine-tos/volcengine_tos.go | 20 +-- .../volcengine-vod/volcengine_vod.go | 21 +-- .../volcengine-waf/volcengine_waf.go | 21 +-- .../providers/wangsu-cdn/wangsu_cdn.go | 20 +-- .../providers/wangsu-cdnpro/wangsu_cdnpro.go | 13 +- .../wangsu-certificate/wangsu_certificate.go | 20 +-- .../deployer/providers/webhook/webhook.go | 13 +- .../providers/zenlayer-cdn/zenlayer_cdn.go | 20 +-- .../providers/zenlayer-ga/zenlayer_ga.go | 20 +-- pkg/core/deployer/typealias.go | 10 ++ pkg/core/notifier/provider.go | 9 -- .../providers/dingtalkbot/dingtalkbot.go | 15 +- .../providers/discordbot/discordbot.go | 13 +- pkg/core/notifier/providers/email/email.go | 13 +- .../notifier/providers/larkbot/larkbot.go | 15 +- .../providers/mattermost/mattermost.go | 13 +- .../notifier/providers/slackbot/slackbot.go | 15 +- .../providers/slackbot/slackbot_test.go | 2 +- .../providers/telegrambot/telegrambot.go | 13 +- .../notifier/providers/webhook/webhook.go | 13 +- .../notifier/providers/wecombot/wecombot.go | 15 +- pkg/core/notifier/typealias.go | 10 ++ 486 files changed, 3194 insertions(+), 2001 deletions(-) create mode 100644 .tmp_provider_refactor_files.txt create mode 100644 pkg/core/certifier/challengers/http01/ftp/internal/lego.go create mode 100644 pkg/core/certifier/challengers/http01/s3/internal/lego.go create mode 100644 pkg/core/certifier/challengers/http01/ssh/internal/ssh.go rename pkg/core/certifier/{challenger.go => typealias.go} (100%) delete mode 100644 pkg/core/certmgr/errors.go delete mode 100644 pkg/core/certmgr/provider.go create mode 100644 pkg/core/certmgr/typealias.go delete mode 100644 pkg/core/deployer/provider.go create mode 100644 pkg/core/deployer/typealias.go delete mode 100644 pkg/core/notifier/provider.go create mode 100644 pkg/core/notifier/typealias.go diff --git a/.tmp_provider_refactor_files.txt b/.tmp_provider_refactor_files.txt new file mode 100644 index 000000000..ef3af64fd --- /dev/null +++ b/.tmp_provider_refactor_files.txt @@ -0,0 +1,132 @@ +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\1panel-console\1panel_console.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-alb\aliyun_alb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-apigw\aliyun_apigw.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-cas\aliyun_cas.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-cas-deploy\aliyun_cas_deploy.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-cdn\aliyun_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-clb\aliyun_clb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-dcdn\aliyun_dcdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-ddospro\aliyun_ddospro.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-esa\aliyun_esa.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-esa-saas\aliyun_esasaas.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-fc\aliyun_fc.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-ga\aliyun_ga.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-live\aliyun_live.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-nlb\aliyun_nlb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-oss\aliyun_oss.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-vod\aliyun_vod.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aliyun-waf\aliyun_waf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\apisix\apisix.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aws-acm\aws_acm.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aws-cloudfront\aws_cloudfront.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\aws-iam\aws_iam.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\azure-keyvault\azure_keyvault.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baiducloud-appblb\baiducloud_appblb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baiducloud-blb\baiducloud_blb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baiducloud-cdn\baiducloud_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baiducloud-cert\baiducloud_cert.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baishan-cdn\baishan_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baotapanel\baotapanel.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baotapanel-console\baotapanel_console.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baotapanelgo\baotapanelgo.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baotapanelgo-console\baotapanelgo_console.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baotawaf\baotawaf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\baotawaf-console\baotawaf_console.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\bunny-cdn\bunny_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\byteplus-cdn\byteplus_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\byteplus-certcenter\byteplus_certcenter.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\byteplus-medialive\byteplus_medialive.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\byteplus-tos\byteplus_tos.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\cachefly\cachefly.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\cdnfly\cdnfly.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\cpanel\cpanel.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ctcccloud-ao\ctcccloud_ao.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ctcccloud-cdn\ctcccloud_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ctcccloud-cms\ctcccloud_cms.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ctcccloud-elb\ctcccloud_elb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ctcccloud-faas\ctcccloud_faas.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ctcccloud-icdn\ctcccloud_icdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ctcccloud-lvdn\ctcccloud_lvdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\dogecloud-cdn\dogecloud_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\dokploy\dokploy.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\flexcdn\flexcdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\flyio\flyio.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ftp\ftp.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\gcore-cdn\gcore_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\goedge\goedge.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\huaweicloud-aad\huaweicloud_aad.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\huaweicloud-apig\huaweicloud_apig.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\huaweicloud-cdn\huaweicloud_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\huaweicloud-elb\huaweicloud_elb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\huaweicloud-live\huaweicloud_live.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\huaweicloud-obs\huaweicloud_obs.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\huaweicloud-scm\huaweicloud_scm.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\huaweicloud-waf\huaweicloud_waf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\jdcloud-alb\jdcloud_alb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\jdcloud-cdn\jdcloud_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\jdcloud-live\jdcloud_live.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\jdcloud-ssl\jdcloud_ssl.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\jdcloud-vod\jdcloud_vod.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\jdcloud-waf\jdcloud_waf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\k8s-secret\k8s_secret.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\kong\kong.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ksyun-cdn\ksyun_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ksyun-slb\ksyun_slb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\lecdn\lecdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\local\local.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\mohua-mvh\mohua_mvh.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\netlify\netlify.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\nginxproxymanager\nginxproxymanager.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\proxmoxve\proxmoxve.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\qiniu-cdn\qiniu_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\qiniu-kodo\qiniu_kodo.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\qiniu-pili\qiniu_pili.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\rainyun-rcdn\rainyun_rcdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\rainyun-sslcenter\rainyun_sslcenter.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ratpanel\ratpanel.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ratpanel-console\ratpanel_console.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\s3\s3.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\safeline\safeline.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\samwaf\samwaf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ssh\ssh.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\synologydsm\synologydsm.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-cdn\tencentcloud_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-clb\tencentcloud_clb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-cos\tencentcloud_cos.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-css\tencentcloud_css.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-ecdn\tencentcloud_ecdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-eo\tencentcloud_eo.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-gaap\tencentcloud_gaap.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-scf\tencentcloud_scf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-ssl\tencentcloud_ssl.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-ssl-deploy\tencentcloud_ssl_deploy.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-ssl-update\tencentcloud_ssl_update.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-vod\tencentcloud_vod.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\tencentcloud-waf\tencentcloud_waf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ucloud-ualb\ucloud_ualb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ucloud-ucdn\ucloud_ucdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ucloud-uclb\ucloud_uclb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ucloud-uewaf\ucloud_uewaf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ucloud-upathx\ucloud_upathx.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\ucloud-us3\ucloud_us3.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\unicloud-webhost\unicloud_webhost.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\upyun-cdn\upyun_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\upyun-file\upyun_file.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\vercel\vercel.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-alb\volcengine_alb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-apig\volcengine_apig.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-cdn\volcengine_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-certcenter\volcengine_certcenter.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-clb\volcengine_clb.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-dcdn\volcengine_dcdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-imagex\volcengine_imagex.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-live\volcengine_live.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-tos\volcengine_tos.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-vod\volcengine_vod.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\volcengine-waf\volcengine_waf.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\wangsu-cdn\wangsu_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\wangsu-cdnpro\wangsu_cdnpro.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\wangsu-certificate\wangsu_certificate.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\webhook\webhook.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\zenlayer-cdn\zenlayer_cdn.go +D:\Projects\certimate\dev-fork\pkg\core\deployer\providers\zenlayer-ga\zenlayer_ga.go diff --git a/internal/certacme/certifiers/sp_35cn.go b/internal/certacme/certifiers/sp_35cn.go index d30800bcf..660c0a70f 100644 --- a/internal/certacme/certifiers/sp_35cn.go +++ b/internal/certacme/certifiers/sp_35cn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - west35cn "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/35cn" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/35cn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := west35cn.NewChallenger(&west35cn.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Username: credentials.Username, ApiPassword: credentials.ApiPassword, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_51dnscom.go b/internal/certacme/certifiers/sp_51dnscom.go index ef9ddf752..32b9ae2ae 100644 --- a/internal/certacme/certifiers/sp_51dnscom.go +++ b/internal/certacme/certifiers/sp_51dnscom.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - dnscom "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/51dnscom" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/51dnscom" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dnscom.NewChallenger(&dnscom.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_acmedns.go b/internal/certacme/certifiers/sp_acmedns.go index 25d324fb4..147bde2e1 100644 --- a/internal/certacme/certifiers/sp_acmedns.go +++ b/internal/certacme/certifiers/sp_acmedns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/acmedns" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/acmedns" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := acmedns.NewChallenger(&acmedns.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ServerUrl: credentials.ServerUrl, Credentials: credentials.Credentials, }) diff --git a/internal/certacme/certifiers/sp_acmehttpreq.go b/internal/certacme/certifiers/sp_acmehttpreq.go index 8e05086e8..d7a16963e 100644 --- a/internal/certacme/certifiers/sp_acmehttpreq.go +++ b/internal/certacme/certifiers/sp_acmehttpreq.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/acmehttpreq" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/acmehttpreq" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := acmehttpreq.NewChallenger(&acmehttpreq.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Endpoint: credentials.Endpoint, Mode: credentials.Mode, Username: credentials.Username, diff --git a/internal/certacme/certifiers/sp_akamai_edgedns.go b/internal/certacme/certifiers/sp_akamai_edgedns.go index 38ecbe29d..c392bd4ee 100644 --- a/internal/certacme/certifiers/sp_akamai_edgedns.go +++ b/internal/certacme/certifiers/sp_akamai_edgedns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - akamaiedgedns "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/akamai-edgedns" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/akamai-edgedns" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := akamaiedgedns.NewChallenger(&akamaiedgedns.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Host: credentials.Host, ClientToken: credentials.ClientToken, ClientSecret: credentials.ClientSecret, diff --git a/internal/certacme/certifiers/sp_aliyun_dns.go b/internal/certacme/certifiers/sp_aliyun_dns.go index 154fd08d5..9eb55cd6a 100644 --- a/internal/certacme/certifiers/sp_aliyun_dns.go +++ b/internal/certacme/certifiers/sp_aliyun_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aliyun" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aliyun" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyun.NewChallenger(&aliyun.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_aliyun_esa.go b/internal/certacme/certifiers/sp_aliyun_esa.go index 985024fde..a8866d015 100644 --- a/internal/certacme/certifiers/sp_aliyun_esa.go +++ b/internal/certacme/certifiers/sp_aliyun_esa.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunesa "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aliyun-esa" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aliyun-esa" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunesa.NewChallenger(&aliyunesa.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certacme/certifiers/sp_arvancloud.go b/internal/certacme/certifiers/sp_arvancloud.go index ad4e5a20c..f5c58d7eb 100644 --- a/internal/certacme/certifiers/sp_arvancloud.go +++ b/internal/certacme/certifiers/sp_arvancloud.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/arvancloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/arvancloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := arvancloud.NewChallenger(&arvancloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_aws_lightsail.go b/internal/certacme/certifiers/sp_aws_lightsail.go index ec556fe3b..f200d829e 100644 --- a/internal/certacme/certifiers/sp_aws_lightsail.go +++ b/internal/certacme/certifiers/sp_aws_lightsail.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - awslightsail "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aws-lightsail" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aws-lightsail" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := awslightsail.NewChallenger(&awslightsail.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certacme/certifiers/sp_aws_route53.go b/internal/certacme/certifiers/sp_aws_route53.go index 32df49eae..7ee7b6c4f 100644 --- a/internal/certacme/certifiers/sp_aws_route53.go +++ b/internal/certacme/certifiers/sp_aws_route53.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - awsroute53 "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aws-route53" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aws-route53" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := awsroute53.NewChallenger(&awsroute53.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certacme/certifiers/sp_azure_dns.go b/internal/certacme/certifiers/sp_azure_dns.go index 3bacd2618..4c5d30ed2 100644 --- a/internal/certacme/certifiers/sp_azure_dns.go +++ b/internal/certacme/certifiers/sp_azure_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - azuredns "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/azure-dns" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/azure-dns" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := azuredns.NewChallenger(&azuredns.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ TenantId: credentials.TenantId, ClientId: credentials.ClientId, ClientSecret: credentials.ClientSecret, diff --git a/internal/certacme/certifiers/sp_baiducloud_dns.go b/internal/certacme/certifiers/sp_baiducloud_dns.go index c3fa2adc4..94a426da9 100644 --- a/internal/certacme/certifiers/sp_baiducloud_dns.go +++ b/internal/certacme/certifiers/sp_baiducloud_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/baiducloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/baiducloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baiducloud.NewChallenger(&baiducloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_beget.go b/internal/certacme/certifiers/sp_beget.go index 1d0c09e1f..2a87394f2 100644 --- a/internal/certacme/certifiers/sp_beget.go +++ b/internal/certacme/certifiers/sp_beget.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/beget" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/beget" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := beget.NewChallenger(&beget.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Username: credentials.Username, ApiPassword: credentials.ApiPassword, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_bookmyname.go b/internal/certacme/certifiers/sp_bookmyname.go index 96e7e1c9f..77ab45c88 100644 --- a/internal/certacme/certifiers/sp_bookmyname.go +++ b/internal/certacme/certifiers/sp_bookmyname.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/bookmyname" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/bookmyname" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := bookmyname.NewChallenger(&bookmyname.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Username: credentials.Username, Password: credentials.Password, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_bunny.go b/internal/certacme/certifiers/sp_bunny.go index f8cd94ad8..8ace7fe74 100644 --- a/internal/certacme/certifiers/sp_bunny.go +++ b/internal/certacme/certifiers/sp_bunny.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/bunny" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/bunny" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := bunny.NewChallenger(&bunny.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_byteplus_dns.go b/internal/certacme/certifiers/sp_byteplus_dns.go index 1f253db96..84301c6cf 100644 --- a/internal/certacme/certifiers/sp_byteplus_dns.go +++ b/internal/certacme/certifiers/sp_byteplus_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/byteplus" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/byteplus" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := byteplus.NewChallenger(&byteplus.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_cloudflare.go b/internal/certacme/certifiers/sp_cloudflare.go index 699cf9996..65ee34988 100644 --- a/internal/certacme/certifiers/sp_cloudflare.go +++ b/internal/certacme/certifiers/sp_cloudflare.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cloudflare" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cloudflare" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := cloudflare.NewChallenger(&cloudflare.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ DnsApiToken: credentials.DnsApiToken, ZoneApiToken: credentials.ZoneApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_cloudns.go b/internal/certacme/certifiers/sp_cloudns.go index f51c63b8b..148e8a7c2 100644 --- a/internal/certacme/certifiers/sp_cloudns.go +++ b/internal/certacme/certifiers/sp_cloudns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cloudns" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cloudns" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := cloudns.NewChallenger(&cloudns.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AuthId: credentials.AuthId, AuthPassword: credentials.AuthPassword, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_cmcccloud_dns.go b/internal/certacme/certifiers/sp_cmcccloud_dns.go index 91941c9f3..74eea0508 100644 --- a/internal/certacme/certifiers/sp_cmcccloud_dns.go +++ b/internal/certacme/certifiers/sp_cmcccloud_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cmcccloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cmcccloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := cmcccloud.NewChallenger(&cmcccloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_conohavps.go b/internal/certacme/certifiers/sp_conohavps.go index 35f6ec212..4ade71fe8 100644 --- a/internal/certacme/certifiers/sp_conohavps.go +++ b/internal/certacme/certifiers/sp_conohavps.go @@ -5,8 +5,8 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - conohavpsv2 "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/conohavpsv2" - conohavpsv3 "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/conohavpsv3" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/conohavpsv2" + chlgimplv3 "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/conohavpsv3" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { switch credentials.ApiVersion { case "2", "2.0", "v2", "v2.0": - return conohavpsv2.NewChallenger(&conohavpsv2.ChallengerConfig{ + return chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiUserName: credentials.ApiUserName, ApiPassword: credentials.ApiPassword, TenantId: credentials.TenantId, @@ -27,7 +27,7 @@ func init() { DnsTTL: options.DnsTTL, }) case "3", "3.0", "v3", "v3.0": - return conohavpsv3.NewChallenger(&conohavpsv3.ChallengerConfig{ + return chlgimplv3.NewChallenger(&chlgimplv3.ChallengerConfig{ ApiUserId: credentials.ApiUserId, ApiUserName: credentials.ApiUserName, ApiPassword: credentials.ApiPassword, diff --git a/internal/certacme/certifiers/sp_constellix.go b/internal/certacme/certifiers/sp_constellix.go index 78d010f07..e7d6dabea 100644 --- a/internal/certacme/certifiers/sp_constellix.go +++ b/internal/certacme/certifiers/sp_constellix.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/constellix" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/constellix" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := constellix.NewChallenger(&constellix.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, SecretKey: credentials.SecretKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_cpanel.go b/internal/certacme/certifiers/sp_cpanel.go index 805a6a068..f26d3e3fa 100644 --- a/internal/certacme/certifiers/sp_cpanel.go +++ b/internal/certacme/certifiers/sp_cpanel.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cpanel" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cpanel" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := cpanel.NewChallenger(&cpanel.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ServerUrl: credentials.ServerUrl, Username: credentials.Username, ApiToken: credentials.ApiToken, diff --git a/internal/certacme/certifiers/sp_ctcccloud_smartdns.go b/internal/certacme/certifiers/sp_ctcccloud_smartdns.go index 27d1b186c..bc705f5b1 100644 --- a/internal/certacme/certifiers/sp_ctcccloud_smartdns.go +++ b/internal/certacme/certifiers/sp_ctcccloud_smartdns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ctcccloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ctcccloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ctcccloud.NewChallenger(&ctcccloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_desec.go b/internal/certacme/certifiers/sp_desec.go index 043678326..d04130a71 100644 --- a/internal/certacme/certifiers/sp_desec.go +++ b/internal/certacme/certifiers/sp_desec.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/desec" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/desec" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := desec.NewChallenger(&desec.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Token: credentials.Token, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_digitalocean.go b/internal/certacme/certifiers/sp_digitalocean.go index 0f5afae48..8c670ec1d 100644 --- a/internal/certacme/certifiers/sp_digitalocean.go +++ b/internal/certacme/certifiers/sp_digitalocean.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/digitalocean" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/digitalocean" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := digitalocean.NewChallenger(&digitalocean.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessToken: credentials.AccessToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_dnsexit.go b/internal/certacme/certifiers/sp_dnsexit.go index a0f80e937..46f2122d2 100644 --- a/internal/certacme/certifiers/sp_dnsexit.go +++ b/internal/certacme/certifiers/sp_dnsexit.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dnsexit" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dnsexit" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dnsexit.NewChallenger(&dnsexit.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_dnsla.go b/internal/certacme/certifiers/sp_dnsla.go index bbf9ac545..9d61f7885 100644 --- a/internal/certacme/certifiers/sp_dnsla.go +++ b/internal/certacme/certifiers/sp_dnsla.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dnsla" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dnsla" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dnsla.NewChallenger(&dnsla.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiId: credentials.ApiId, ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_dnsmadeeasy.go b/internal/certacme/certifiers/sp_dnsmadeeasy.go index f5084b3e7..4733454d4 100644 --- a/internal/certacme/certifiers/sp_dnsmadeeasy.go +++ b/internal/certacme/certifiers/sp_dnsmadeeasy.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dnsmadeeasy" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dnsmadeeasy" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dnsmadeeasy.NewChallenger(&dnsmadeeasy.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_duckdns.go b/internal/certacme/certifiers/sp_duckdns.go index f5db628cc..9a7989ec3 100644 --- a/internal/certacme/certifiers/sp_duckdns.go +++ b/internal/certacme/certifiers/sp_duckdns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/duckdns" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/duckdns" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := duckdns.NewChallenger(&duckdns.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Token: credentials.Token, DnsPropagationTimeout: options.DnsPropagationTimeout, }) diff --git a/internal/certacme/certifiers/sp_dynadot.go b/internal/certacme/certifiers/sp_dynadot.go index 2a7168210..272d6007a 100644 --- a/internal/certacme/certifiers/sp_dynadot.go +++ b/internal/certacme/certifiers/sp_dynadot.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dynadot" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dynadot" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dynadot.NewChallenger(&dynadot.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_dynu.go b/internal/certacme/certifiers/sp_dynu.go index 9aeff641d..2e4d88338 100644 --- a/internal/certacme/certifiers/sp_dynu.go +++ b/internal/certacme/certifiers/sp_dynu.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dynu" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dynu" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dynu.NewChallenger(&dynu.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_dynv6.go b/internal/certacme/certifiers/sp_dynv6.go index 4d1a0c5d0..2eae719ea 100644 --- a/internal/certacme/certifiers/sp_dynv6.go +++ b/internal/certacme/certifiers/sp_dynv6.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dynv6" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dynv6" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dynv6.NewChallenger(&dynv6.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ HttpToken: credentials.HttpToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_ftp.go b/internal/certacme/certifiers/sp_ftp.go index e3fd56300..749212494 100644 --- a/internal/certacme/certifiers/sp_ftp.go +++ b/internal/certacme/certifiers/sp_ftp.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/ftp" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/ftp" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ftp.NewChallenger(&ftp.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ FtpHost: credentials.Host, FtpPort: credentials.Port, FtpUsername: credentials.Username, diff --git a/internal/certacme/certifiers/sp_gandinet.go b/internal/certacme/certifiers/sp_gandinet.go index c1bd01da1..1e546aebc 100644 --- a/internal/certacme/certifiers/sp_gandinet.go +++ b/internal/certacme/certifiers/sp_gandinet.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/gandinet" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/gandinet" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := gandinet.NewChallenger(&gandinet.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ PersonalAccessToken: credentials.PersonalAccessToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_gcore.go b/internal/certacme/certifiers/sp_gcore.go index 0f001c250..0565526dd 100644 --- a/internal/certacme/certifiers/sp_gcore.go +++ b/internal/certacme/certifiers/sp_gcore.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/gcore" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/gcore" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := gcore.NewChallenger(&gcore.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_gname.go b/internal/certacme/certifiers/sp_gname.go index da2c98360..9bf4a14ac 100644 --- a/internal/certacme/certifiers/sp_gname.go +++ b/internal/certacme/certifiers/sp_gname.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/gname" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/gname" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := gname.NewChallenger(&gname.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AppId: credentials.AppId, AppKey: credentials.AppKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_godaddy.go b/internal/certacme/certifiers/sp_godaddy.go index f490f5b9b..d9400e2e9 100644 --- a/internal/certacme/certifiers/sp_godaddy.go +++ b/internal/certacme/certifiers/sp_godaddy.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/godaddy" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/godaddy" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := godaddy.NewChallenger(&godaddy.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_hetzner.go b/internal/certacme/certifiers/sp_hetzner.go index a93ce0600..fb66dad9a 100644 --- a/internal/certacme/certifiers/sp_hetzner.go +++ b/internal/certacme/certifiers/sp_hetzner.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/hetzner" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/hetzner" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := hetzner.NewChallenger(&hetzner.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_hostingde.go b/internal/certacme/certifiers/sp_hostingde.go index 526196ba3..76ca88148 100644 --- a/internal/certacme/certifiers/sp_hostingde.go +++ b/internal/certacme/certifiers/sp_hostingde.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/hostingde" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/hostingde" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := hostingde.NewChallenger(&hostingde.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_hostinger.go b/internal/certacme/certifiers/sp_hostinger.go index cb9aa61bb..04b3223e6 100644 --- a/internal/certacme/certifiers/sp_hostinger.go +++ b/internal/certacme/certifiers/sp_hostinger.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/hostinger" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/hostinger" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := hostinger.NewChallenger(&hostinger.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_huaweicloud_dns.go b/internal/certacme/certifiers/sp_huaweicloud_dns.go index 5d98104bb..c29f56780 100644 --- a/internal/certacme/certifiers/sp_huaweicloud_dns.go +++ b/internal/certacme/certifiers/sp_huaweicloud_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/huaweicloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/huaweicloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloud.NewChallenger(&huaweicloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certacme/certifiers/sp_infomaniak.go b/internal/certacme/certifiers/sp_infomaniak.go index 878ba1cae..5a5da6b4c 100644 --- a/internal/certacme/certifiers/sp_infomaniak.go +++ b/internal/certacme/certifiers/sp_infomaniak.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/infomaniak" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/infomaniak" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := infomaniak.NewChallenger(&infomaniak.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessToken: credentials.AccessToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_ionos.go b/internal/certacme/certifiers/sp_ionos.go index 86cbf9fa6..d73de162c 100644 --- a/internal/certacme/certifiers/sp_ionos.go +++ b/internal/certacme/certifiers/sp_ionos.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ionos" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ionos" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ionos.NewChallenger(&ionos.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKeyPublicPrefix: credentials.ApiKeyPublicPrefix, ApiKeySecret: credentials.ApiKeySecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_jdcloud_dns.go b/internal/certacme/certifiers/sp_jdcloud_dns.go index 82940229c..e5d6cf77f 100644 --- a/internal/certacme/certifiers/sp_jdcloud_dns.go +++ b/internal/certacme/certifiers/sp_jdcloud_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/jdcloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/jdcloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := jdcloud.NewChallenger(&jdcloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), diff --git a/internal/certacme/certifiers/sp_linode.go b/internal/certacme/certifiers/sp_linode.go index 7445be6f5..ba0a4bbe2 100644 --- a/internal/certacme/certifiers/sp_linode.go +++ b/internal/certacme/certifiers/sp_linode.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/linode" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/linode" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := linode.NewChallenger(&linode.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessToken: credentials.AccessToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_local.go b/internal/certacme/certifiers/sp_local.go index 18e5c2ab7..a08f13155 100644 --- a/internal/certacme/certifiers/sp_local.go +++ b/internal/certacme/certifiers/sp_local.go @@ -3,13 +3,13 @@ package certifiers import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/local" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/local" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) func init() { ACMEHttp01Registries.MustRegister(domain.ACMEHttp01ProviderTypeLocal, func(options *ProviderFactoryOptions) (core.ACMEChallenger, error) { - provider, err := local.NewChallenger(&local.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ WebRootPath: xmaps.GetString(options.ProviderExtendedConfig, "webRootPath"), }) return provider, err diff --git a/internal/certacme/certifiers/sp_namecheap.go b/internal/certacme/certifiers/sp_namecheap.go index 917c80790..59f2856d7 100644 --- a/internal/certacme/certifiers/sp_namecheap.go +++ b/internal/certacme/certifiers/sp_namecheap.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - namecheap "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/namecheap" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/namecheap" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := namecheap.NewChallenger(&namecheap.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Username: credentials.Username, ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_namedotcom.go b/internal/certacme/certifiers/sp_namedotcom.go index 1729201f8..73556ab87 100644 --- a/internal/certacme/certifiers/sp_namedotcom.go +++ b/internal/certacme/certifiers/sp_namedotcom.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/namedotcom" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/namedotcom" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := namedotcom.NewChallenger(&namedotcom.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Username: credentials.Username, ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_namesilo.go b/internal/certacme/certifiers/sp_namesilo.go index 89cbc8979..c0e6d518f 100644 --- a/internal/certacme/certifiers/sp_namesilo.go +++ b/internal/certacme/certifiers/sp_namesilo.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/namesilo" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/namesilo" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := namesilo.NewChallenger(&namesilo.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_netcup.go b/internal/certacme/certifiers/sp_netcup.go index 28267ece5..73e2fd06c 100644 --- a/internal/certacme/certifiers/sp_netcup.go +++ b/internal/certacme/certifiers/sp_netcup.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/netcup" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/netcup" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := netcup.NewChallenger(&netcup.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ CustomerNumber: credentials.CustomerNumber, ApiKey: credentials.ApiKey, ApiPassword: credentials.ApiPassword, diff --git a/internal/certacme/certifiers/sp_netlify.go b/internal/certacme/certifiers/sp_netlify.go index 0ee6b902d..4bbbbac21 100644 --- a/internal/certacme/certifiers/sp_netlify.go +++ b/internal/certacme/certifiers/sp_netlify.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/netlify" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/netlify" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := netlify.NewChallenger(&netlify.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiToken: credentials.ApiToken, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_ns1.go b/internal/certacme/certifiers/sp_ns1.go index b68826d2d..a6fc60be7 100644 --- a/internal/certacme/certifiers/sp_ns1.go +++ b/internal/certacme/certifiers/sp_ns1.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ns1" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ns1" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ns1.NewChallenger(&ns1.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_ovhcloud.go b/internal/certacme/certifiers/sp_ovhcloud.go index b6a0a54a9..a328da4b5 100644 --- a/internal/certacme/certifiers/sp_ovhcloud.go +++ b/internal/certacme/certifiers/sp_ovhcloud.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ovhcloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ovhcloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ovhcloud.NewChallenger(&ovhcloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Endpoint: credentials.Endpoint, AuthMethod: credentials.AuthMethod, ApplicationKey: credentials.ApplicationKey, diff --git a/internal/certacme/certifiers/sp_porkbun.go b/internal/certacme/certifiers/sp_porkbun.go index 03553db63..fac662662 100644 --- a/internal/certacme/certifiers/sp_porkbun.go +++ b/internal/certacme/certifiers/sp_porkbun.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/porkbun" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/porkbun" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := porkbun.NewChallenger(&porkbun.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, SecretApiKey: credentials.SecretApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_powerdns.go b/internal/certacme/certifiers/sp_powerdns.go index 2f91dfaed..552ef7a42 100644 --- a/internal/certacme/certifiers/sp_powerdns.go +++ b/internal/certacme/certifiers/sp_powerdns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/powerdns" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/powerdns" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := powerdns.NewChallenger(&powerdns.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certacme/certifiers/sp_qingcloud_dns.go b/internal/certacme/certifiers/sp_qingcloud_dns.go index fb3e352ce..1baf7469f 100644 --- a/internal/certacme/certifiers/sp_qingcloud_dns.go +++ b/internal/certacme/certifiers/sp_qingcloud_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/qingcloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/qingcloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := qingcloud.NewChallenger(&qingcloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_rainyun.go b/internal/certacme/certifiers/sp_rainyun.go index f448cfd4e..eafdb2087 100644 --- a/internal/certacme/certifiers/sp_rainyun.go +++ b/internal/certacme/certifiers/sp_rainyun.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/rainyun" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/rainyun" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := rainyun.NewChallenger(&rainyun.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_regru.go b/internal/certacme/certifiers/sp_regru.go index 95488f15a..82dc82609 100644 --- a/internal/certacme/certifiers/sp_regru.go +++ b/internal/certacme/certifiers/sp_regru.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/regru" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/regru" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := regru.NewChallenger(®ru.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Username: credentials.Username, Password: credentials.Password, MtlsCertificate: credentials.MtlsCertificate, diff --git a/internal/certacme/certifiers/sp_rfc2136.go b/internal/certacme/certifiers/sp_rfc2136.go index 7ba2fbbca..c0002d1f7 100644 --- a/internal/certacme/certifiers/sp_rfc2136.go +++ b/internal/certacme/certifiers/sp_rfc2136.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/rfc2136" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/rfc2136" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := rfc2136.NewChallenger(&rfc2136.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Host: credentials.Host, Port: credentials.Port, TsigAlgorithm: credentials.TsigAlgorithm, diff --git a/internal/certacme/certifiers/sp_rucenter.go b/internal/certacme/certifiers/sp_rucenter.go index 89d01e0bf..9cc3e704e 100644 --- a/internal/certacme/certifiers/sp_rucenter.go +++ b/internal/certacme/certifiers/sp_rucenter.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/rucenter" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/rucenter" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := rucenter.NewChallenger(&rucenter.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Username: credentials.Username, Password: credentials.Password, ApplicationId: credentials.ApplicationId, diff --git a/internal/certacme/certifiers/sp_s3.go b/internal/certacme/certifiers/sp_s3.go index c75f5d1ac..f11c5de78 100644 --- a/internal/certacme/certifiers/sp_s3.go +++ b/internal/certacme/certifiers/sp_s3.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/s3" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/s3" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := s3.NewChallenger(&s3.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Endpoint: credentials.Endpoint, AccessKey: credentials.AccessKey, SecretKey: credentials.SecretKey, diff --git a/internal/certacme/certifiers/sp_spaceship.go b/internal/certacme/certifiers/sp_spaceship.go index 243dc1b03..9b38cd051 100644 --- a/internal/certacme/certifiers/sp_spaceship.go +++ b/internal/certacme/certifiers/sp_spaceship.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/spaceship" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/spaceship" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := spaceship.NewChallenger(&spaceship.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, ApiSecret: credentials.ApiSecret, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_ssh.go b/internal/certacme/certifiers/sp_ssh.go index 9d4908d2b..d4c9c9465 100644 --- a/internal/certacme/certifiers/sp_ssh.go +++ b/internal/certacme/certifiers/sp_ssh.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/ssh" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/ssh" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,9 +16,9 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - jumpServers := make([]ssh.ServerConfig, len(credentials.JumpServers)) + jumpServers := make([]chlgimpl.ServerConfig, len(credentials.JumpServers)) for i, jumpServer := range credentials.JumpServers { - jumpServers[i] = ssh.ServerConfig{ + jumpServers[i] = chlgimpl.ServerConfig{ SshHost: jumpServer.Host, SshPort: jumpServer.Port, SshAuthMethod: jumpServer.AuthMethod, @@ -29,8 +29,8 @@ func init() { } } - provider, err := ssh.NewChallenger(&ssh.ChallengerConfig{ - ServerConfig: ssh.ServerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ + ServerConfig: chlgimpl.ServerConfig{ SshHost: credentials.Host, SshPort: credentials.Port, SshAuthMethod: credentials.AuthMethod, diff --git a/internal/certacme/certifiers/sp_technitiumdns.go b/internal/certacme/certifiers/sp_technitiumdns.go index 37b0daff4..8b7a02aa0 100644 --- a/internal/certacme/certifiers/sp_technitiumdns.go +++ b/internal/certacme/certifiers/sp_technitiumdns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/technitiumdns" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/technitiumdns" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := technitiumdns.NewChallenger(&technitiumdns.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ServerUrl: credentials.ServerUrl, ApiToken: credentials.ApiToken, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certacme/certifiers/sp_tencentcloud_dns.go b/internal/certacme/certifiers/sp_tencentcloud_dns.go index d6d064b2c..9259815d9 100644 --- a/internal/certacme/certifiers/sp_tencentcloud_dns.go +++ b/internal/certacme/certifiers/sp_tencentcloud_dns.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/tencentcloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/tencentcloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloud.NewChallenger(&tencentcloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_tencentcloud_eo.go b/internal/certacme/certifiers/sp_tencentcloud_eo.go index 1ff49e422..26c076d93 100644 --- a/internal/certacme/certifiers/sp_tencentcloud_eo.go +++ b/internal/certacme/certifiers/sp_tencentcloud_eo.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - teo "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/tencentcloud-eo" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/tencentcloud-eo" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := teo.NewChallenger(&teo.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_todaynic.go b/internal/certacme/certifiers/sp_todaynic.go index 8f88e9be6..4e15bbee7 100644 --- a/internal/certacme/certifiers/sp_todaynic.go +++ b/internal/certacme/certifiers/sp_todaynic.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/todaynic" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/todaynic" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := todaynic.NewChallenger(&todaynic.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ UserId: credentials.UserId, ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_ucloud_udnr.go b/internal/certacme/certifiers/sp_ucloud_udnr.go index 856f09110..fa6983976 100644 --- a/internal/certacme/certifiers/sp_ucloud_udnr.go +++ b/internal/certacme/certifiers/sp_ucloud_udnr.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ucloud" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ucloud" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ucloud.NewChallenger(&ucloud.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ PrivateKey: credentials.PrivateKey, PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, diff --git a/internal/certacme/certifiers/sp_vercel.go b/internal/certacme/certifiers/sp_vercel.go index b8e476eb4..df40b8b4d 100644 --- a/internal/certacme/certifiers/sp_vercel.go +++ b/internal/certacme/certifiers/sp_vercel.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/vercel" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/vercel" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := vercel.NewChallenger(&vercel.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiAccessToken: credentials.ApiAccessToken, TeamId: credentials.TeamId, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_volcengine.go b/internal/certacme/certifiers/sp_volcengine.go index f20de6984..8ca15c01b 100644 --- a/internal/certacme/certifiers/sp_volcengine.go +++ b/internal/certacme/certifiers/sp_volcengine.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/volcengine" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/volcengine" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcengine.NewChallenger(&volcengine.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_vultr.go b/internal/certacme/certifiers/sp_vultr.go index 99625288c..5663062b4 100644 --- a/internal/certacme/certifiers/sp_vultr.go +++ b/internal/certacme/certifiers/sp_vultr.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/vultr" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/vultr" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := vultr.NewChallenger(&vultr.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ ApiKey: credentials.ApiKey, DnsPropagationTimeout: options.DnsPropagationTimeout, DnsTTL: options.DnsTTL, diff --git a/internal/certacme/certifiers/sp_westcn.go b/internal/certacme/certifiers/sp_westcn.go index 47d6aa63e..53b27b666 100644 --- a/internal/certacme/certifiers/sp_westcn.go +++ b/internal/certacme/certifiers/sp_westcn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/westcn" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/westcn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := westcn.NewChallenger(&westcn.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ Username: credentials.Username, ApiPassword: credentials.ApiPassword, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certacme/certifiers/sp_xinnet.go b/internal/certacme/certifiers/sp_xinnet.go index 84625935e..ad927fde5 100644 --- a/internal/certacme/certifiers/sp_xinnet.go +++ b/internal/certacme/certifiers/sp_xinnet.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/xinnet" + chlgimpl "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/xinnet" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := xinnet.NewChallenger(&xinnet.ChallengerConfig{ + provider, err := chlgimpl.NewChallenger(&chlgimpl.ChallengerConfig{ AgentId: credentials.AgentId, ApiPassword: credentials.ApiPassword, DnsPropagationTimeout: options.DnsPropagationTimeout, diff --git a/internal/certmgmt/deployers/sp_1panel.go b/internal/certmgmt/deployers/sp_1panel.go index 79a622dc6..9eef257ed 100644 --- a/internal/certmgmt/deployers/sp_1panel.go +++ b/internal/certmgmt/deployers/sp_1panel.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - onepanel "github.com/certimate-go/certimate/pkg/core/deployer/providers/1panel" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/1panel" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := onepanel.NewDeployer(&onepanel.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiVersion: credentials.ApiVersion, ApiKey: credentials.ApiKey, diff --git a/internal/certmgmt/deployers/sp_1panel_console.go b/internal/certmgmt/deployers/sp_1panel_console.go index 4b85b0580..ce1bb3ca8 100644 --- a/internal/certmgmt/deployers/sp_1panel_console.go +++ b/internal/certmgmt/deployers/sp_1panel_console.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - opconsole "github.com/certimate-go/certimate/pkg/core/deployer/providers/1panel-console" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/1panel-console" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := opconsole.NewDeployer(&opconsole.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiVersion: credentials.ApiVersion, ApiKey: credentials.ApiKey, diff --git a/internal/certmgmt/deployers/sp_aliyun_alb.go b/internal/certmgmt/deployers/sp_aliyun_alb.go index a06360be6..687c8567d 100644 --- a/internal/certmgmt/deployers/sp_aliyun_alb.go +++ b/internal/certmgmt/deployers/sp_aliyun_alb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunalb "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-alb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-alb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunalb.NewDeployer(&aliyunalb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_apigw.go b/internal/certmgmt/deployers/sp_aliyun_apigw.go index 9fa1ce9f5..be16ffb6f 100644 --- a/internal/certmgmt/deployers/sp_aliyun_apigw.go +++ b/internal/certmgmt/deployers/sp_aliyun_apigw.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunapigw "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-apigw" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-apigw" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunapigw.NewDeployer(&aliyunapigw.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_cas.go b/internal/certmgmt/deployers/sp_aliyun_cas.go index 8ed92665e..edcf971e7 100644 --- a/internal/certmgmt/deployers/sp_aliyun_cas.go +++ b/internal/certmgmt/deployers/sp_aliyun_cas.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyuncas "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cas" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cas" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyuncas.NewDeployer(&aliyuncas.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_casdeploy.go b/internal/certmgmt/deployers/sp_aliyun_casdeploy.go index 4a8212428..c267196b0 100644 --- a/internal/certmgmt/deployers/sp_aliyun_casdeploy.go +++ b/internal/certmgmt/deployers/sp_aliyun_casdeploy.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyuncasdeploy "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cas-deploy" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cas-deploy" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyuncasdeploy.NewDeployer(&aliyuncasdeploy.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_cdn.go b/internal/certmgmt/deployers/sp_aliyun_cdn.go index c61751d4f..9b4af3538 100644 --- a/internal/certmgmt/deployers/sp_aliyun_cdn.go +++ b/internal/certmgmt/deployers/sp_aliyun_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyuncdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyuncdn.NewDeployer(&aliyuncdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_clb.go b/internal/certmgmt/deployers/sp_aliyun_clb.go index 047059598..0d1cc98f2 100644 --- a/internal/certmgmt/deployers/sp_aliyun_clb.go +++ b/internal/certmgmt/deployers/sp_aliyun_clb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunclb "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-clb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-clb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunclb.NewDeployer(&aliyunclb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_dcdn.go b/internal/certmgmt/deployers/sp_aliyun_dcdn.go index ec04a4e2d..c68d01b7d 100644 --- a/internal/certmgmt/deployers/sp_aliyun_dcdn.go +++ b/internal/certmgmt/deployers/sp_aliyun_dcdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyundcdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-dcdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-dcdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyundcdn.NewDeployer(&aliyundcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_ddospro.go b/internal/certmgmt/deployers/sp_aliyun_ddospro.go index 89e038907..447714cc2 100644 --- a/internal/certmgmt/deployers/sp_aliyun_ddospro.go +++ b/internal/certmgmt/deployers/sp_aliyun_ddospro.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunddospro "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-ddospro" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-ddospro" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunddospro.NewDeployer(&aliyunddospro.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_esa.go b/internal/certmgmt/deployers/sp_aliyun_esa.go index 38ef1b0e7..0d2d1b8a4 100644 --- a/internal/certmgmt/deployers/sp_aliyun_esa.go +++ b/internal/certmgmt/deployers/sp_aliyun_esa.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunesa "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-esa" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-esa" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunesa.NewDeployer(&aliyunesa.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_aliyun_esasaas.go b/internal/certmgmt/deployers/sp_aliyun_esasaas.go index 678aabbd2..0c3297e6c 100644 --- a/internal/certmgmt/deployers/sp_aliyun_esasaas.go +++ b/internal/certmgmt/deployers/sp_aliyun_esasaas.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunesasaas "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-esa-saas" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-esa-saas" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunesasaas.NewDeployer(&aliyunesasaas.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_aliyun_fc.go b/internal/certmgmt/deployers/sp_aliyun_fc.go index 22e27136d..00b453ede 100644 --- a/internal/certmgmt/deployers/sp_aliyun_fc.go +++ b/internal/certmgmt/deployers/sp_aliyun_fc.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunfc "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-fc" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-fc" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunfc.NewDeployer(&aliyunfc.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_ga.go b/internal/certmgmt/deployers/sp_aliyun_ga.go index 15004dea5..ce1bec107 100644 --- a/internal/certmgmt/deployers/sp_aliyun_ga.go +++ b/internal/certmgmt/deployers/sp_aliyun_ga.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunga "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-ga" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-ga" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunga.NewDeployer(&aliyunga.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_live.go b/internal/certmgmt/deployers/sp_aliyun_live.go index 7746b2283..2d984f5c4 100644 --- a/internal/certmgmt/deployers/sp_aliyun_live.go +++ b/internal/certmgmt/deployers/sp_aliyun_live.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunlive "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-live" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-live" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunlive.NewDeployer(&aliyunlive.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_aliyun_nlb.go b/internal/certmgmt/deployers/sp_aliyun_nlb.go index 7b2dfc0ed..f3e64ce10 100644 --- a/internal/certmgmt/deployers/sp_aliyun_nlb.go +++ b/internal/certmgmt/deployers/sp_aliyun_nlb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunnlb "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-nlb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-nlb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunnlb.NewDeployer(&aliyunnlb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_oss.go b/internal/certmgmt/deployers/sp_aliyun_oss.go index a73dcfe39..91a0009b3 100644 --- a/internal/certmgmt/deployers/sp_aliyun_oss.go +++ b/internal/certmgmt/deployers/sp_aliyun_oss.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunoss "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-oss" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-oss" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunoss.NewDeployer(&aliyunoss.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_vod.go b/internal/certmgmt/deployers/sp_aliyun_vod.go index aa8299220..7abce2f98 100644 --- a/internal/certmgmt/deployers/sp_aliyun_vod.go +++ b/internal/certmgmt/deployers/sp_aliyun_vod.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunvod "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-vod" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-vod" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunvod.NewDeployer(&aliyunvod.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_aliyun_waf.go b/internal/certmgmt/deployers/sp_aliyun_waf.go index bd1f3b6b0..3f411e963 100644 --- a/internal/certmgmt/deployers/sp_aliyun_waf.go +++ b/internal/certmgmt/deployers/sp_aliyun_waf.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - aliyunwaf "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-waf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aliyun-waf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := aliyunwaf.NewDeployer(&aliyunwaf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_apisix.go b/internal/certmgmt/deployers/sp_apisix.go index 1d932eb3b..cfe982f0c 100644 --- a/internal/certmgmt/deployers/sp_apisix.go +++ b/internal/certmgmt/deployers/sp_apisix.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/apisix" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/apisix" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := apisix.NewDeployer(&apisix.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_aws_acm.go b/internal/certmgmt/deployers/sp_aws_acm.go index 69835d814..59f38e585 100644 --- a/internal/certmgmt/deployers/sp_aws_acm.go +++ b/internal/certmgmt/deployers/sp_aws_acm.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - awsacm "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-acm" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-acm" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := awsacm.NewDeployer(&awsacm.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_aws_cloudfront.go b/internal/certmgmt/deployers/sp_aws_cloudfront.go index 39c3461b4..ae7447696 100644 --- a/internal/certmgmt/deployers/sp_aws_cloudfront.go +++ b/internal/certmgmt/deployers/sp_aws_cloudfront.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - awscloudfront "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-cloudfront" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-cloudfront" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := awscloudfront.NewDeployer(&awscloudfront.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_aws_iam.go b/internal/certmgmt/deployers/sp_aws_iam.go index 7597577f2..dbe824c30 100644 --- a/internal/certmgmt/deployers/sp_aws_iam.go +++ b/internal/certmgmt/deployers/sp_aws_iam.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - awsiam "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-iam" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/aws-iam" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := awsiam.NewDeployer(&awsiam.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_azure_keyvault.go b/internal/certmgmt/deployers/sp_azure_keyvault.go index f5841023b..04912d11e 100644 --- a/internal/certmgmt/deployers/sp_azure_keyvault.go +++ b/internal/certmgmt/deployers/sp_azure_keyvault.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - azurekeyvault "github.com/certimate-go/certimate/pkg/core/deployer/providers/azure-keyvault" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/azure-keyvault" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := azurekeyvault.NewDeployer(&azurekeyvault.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ TenantId: credentials.TenantId, ClientId: credentials.ClientId, ClientSecret: credentials.ClientSecret, diff --git a/internal/certmgmt/deployers/sp_baiducloud_appblb.go b/internal/certmgmt/deployers/sp_baiducloud_appblb.go index 383faeebe..020a28f12 100644 --- a/internal/certmgmt/deployers/sp_baiducloud_appblb.go +++ b/internal/certmgmt/deployers/sp_baiducloud_appblb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baiducloudappblb "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-appblb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-appblb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baiducloudappblb.NewDeployer(&baiducloudappblb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_baiducloud_blb.go b/internal/certmgmt/deployers/sp_baiducloud_blb.go index 6196ab528..b6974939f 100644 --- a/internal/certmgmt/deployers/sp_baiducloud_blb.go +++ b/internal/certmgmt/deployers/sp_baiducloud_blb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baiducloudblb "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-blb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-blb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baiducloudblb.NewDeployer(&baiducloudblb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_baiducloud_cdn.go b/internal/certmgmt/deployers/sp_baiducloud_cdn.go index 169dd689a..82bf6c3a3 100644 --- a/internal/certmgmt/deployers/sp_baiducloud_cdn.go +++ b/internal/certmgmt/deployers/sp_baiducloud_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baiducloudcdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baiducloudcdn.NewDeployer(&baiducloudcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_baiducloud_cert.go b/internal/certmgmt/deployers/sp_baiducloud_cert.go index c1bc65924..db179d374 100644 --- a/internal/certmgmt/deployers/sp_baiducloud_cert.go +++ b/internal/certmgmt/deployers/sp_baiducloud_cert.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baiducloudcert "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-cert" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baiducloud-cert" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baiducloudcert.NewDeployer(&baiducloudcert.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, }) diff --git a/internal/certmgmt/deployers/sp_baishan_cdn.go b/internal/certmgmt/deployers/sp_baishan_cdn.go index 58cbf4d34..b04f2ee60 100644 --- a/internal/certmgmt/deployers/sp_baishan_cdn.go +++ b/internal/certmgmt/deployers/sp_baishan_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baishancdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/baishan-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baishan-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baishancdn.NewDeployer(&baishancdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiToken: credentials.ApiToken, DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_baotapanel.go b/internal/certmgmt/deployers/sp_baotapanel.go index 4b15584c4..0ed5501ad 100644 --- a/internal/certmgmt/deployers/sp_baotapanel.go +++ b/internal/certmgmt/deployers/sp_baotapanel.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baotapanel "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanel" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanel" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baotapanel.NewDeployer(&baotapanel.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_baotapanel_console.go b/internal/certmgmt/deployers/sp_baotapanel_console.go index 91cd21ae6..3bae6b4b1 100644 --- a/internal/certmgmt/deployers/sp_baotapanel_console.go +++ b/internal/certmgmt/deployers/sp_baotapanel_console.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baotapanelconsole "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanel-console" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanel-console" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baotapanelconsole.NewDeployer(&baotapanelconsole.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_baotapanelgo.go b/internal/certmgmt/deployers/sp_baotapanelgo.go index 2967a8f18..4f2112691 100644 --- a/internal/certmgmt/deployers/sp_baotapanelgo.go +++ b/internal/certmgmt/deployers/sp_baotapanelgo.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baotapanelgo "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanelgo" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanelgo" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baotapanelgo.NewDeployer(&baotapanelgo.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_baotapanelgo_console.go b/internal/certmgmt/deployers/sp_baotapanelgo_console.go index ff17332ec..2afac4524 100644 --- a/internal/certmgmt/deployers/sp_baotapanelgo_console.go +++ b/internal/certmgmt/deployers/sp_baotapanelgo_console.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baotapanelgoconsole "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanelgo-console" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotapanelgo-console" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baotapanelgoconsole.NewDeployer(&baotapanelgoconsole.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_baotawaf.go b/internal/certmgmt/deployers/sp_baotawaf.go index 5d56ed173..a71d28447 100644 --- a/internal/certmgmt/deployers/sp_baotawaf.go +++ b/internal/certmgmt/deployers/sp_baotawaf.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baotawaf "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotawaf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotawaf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baotawaf.NewDeployer(&baotawaf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_baotawaf_console.go b/internal/certmgmt/deployers/sp_baotawaf_console.go index 810e2bf87..8234959a6 100644 --- a/internal/certmgmt/deployers/sp_baotawaf_console.go +++ b/internal/certmgmt/deployers/sp_baotawaf_console.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - baotawafconsole "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotawaf-console" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/baotawaf-console" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := baotawafconsole.NewDeployer(&baotawafconsole.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_bunny_cdn.go b/internal/certmgmt/deployers/sp_bunny_cdn.go index f1df0fc3a..db2fa61f6 100644 --- a/internal/certmgmt/deployers/sp_bunny_cdn.go +++ b/internal/certmgmt/deployers/sp_bunny_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - bunnycdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/bunny-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/bunny-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := bunnycdn.NewDeployer(&bunnycdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiKey: credentials.ApiKey, PullZoneId: xmaps.GetString(options.ProviderExtendedConfig, "pullZoneId"), Hostname: xmaps.GetString(options.ProviderExtendedConfig, "hostname"), diff --git a/internal/certmgmt/deployers/sp_byteplus_cdn.go b/internal/certmgmt/deployers/sp_byteplus_cdn.go index 94e74f4f9..a4d27e5de 100644 --- a/internal/certmgmt/deployers/sp_byteplus_cdn.go +++ b/internal/certmgmt/deployers/sp_byteplus_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - bytepluscdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := bytepluscdn.NewDeployer(&bytepluscdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_byteplus_certcenter.go b/internal/certmgmt/deployers/sp_byteplus_certcenter.go index 21844d385..52df3ea5a 100644 --- a/internal/certmgmt/deployers/sp_byteplus_certcenter.go +++ b/internal/certmgmt/deployers/sp_byteplus_certcenter.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - bytepluscertcenter "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-certcenter" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-certcenter" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := bytepluscertcenter.NewDeployer(&bytepluscertcenter.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_byteplus_medialive.go b/internal/certmgmt/deployers/sp_byteplus_medialive.go index 16d5ecef9..c7a2d3e09 100644 --- a/internal/certmgmt/deployers/sp_byteplus_medialive.go +++ b/internal/certmgmt/deployers/sp_byteplus_medialive.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - byteplusmedialive "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-medialive" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-medialive" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := byteplusmedialive.NewDeployer(&byteplusmedialive.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_byteplus_tos.go b/internal/certmgmt/deployers/sp_byteplus_tos.go index e1764ea83..014e3fa56 100644 --- a/internal/certmgmt/deployers/sp_byteplus_tos.go +++ b/internal/certmgmt/deployers/sp_byteplus_tos.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - byteplustos "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-tos" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/byteplus-tos" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := byteplustos.NewDeployer(&byteplustos.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_cachefly.go b/internal/certmgmt/deployers/sp_cachefly.go index 5ba757b8b..4bb7d41a7 100644 --- a/internal/certmgmt/deployers/sp_cachefly.go +++ b/internal/certmgmt/deployers/sp_cachefly.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/cachefly" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cachefly" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := cachefly.NewDeployer(&cachefly.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiToken: credentials.ApiToken, }) return provider, err diff --git a/internal/certmgmt/deployers/sp_cdnfly.go b/internal/certmgmt/deployers/sp_cdnfly.go index 7c0fe3b33..eeb0eadde 100644 --- a/internal/certmgmt/deployers/sp_cdnfly.go +++ b/internal/certmgmt/deployers/sp_cdnfly.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/cdnfly" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cdnfly" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - deployer, err := cdnfly.NewDeployer(&cdnfly.DeployerConfig{ + deployer, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, ApiSecret: credentials.ApiSecret, diff --git a/internal/certmgmt/deployers/sp_cpanel.go b/internal/certmgmt/deployers/sp_cpanel.go index 1c9e59d0d..7d98b07a5 100644 --- a/internal/certmgmt/deployers/sp_cpanel.go +++ b/internal/certmgmt/deployers/sp_cpanel.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/cpanel" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/cpanel" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := cpanel.NewDeployer(&cpanel.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, Username: credentials.Username, ApiToken: credentials.ApiToken, diff --git a/internal/certmgmt/deployers/sp_ctcccloud_ao.go b/internal/certmgmt/deployers/sp_ctcccloud_ao.go index e4614fb49..7c32fd57c 100644 --- a/internal/certmgmt/deployers/sp_ctcccloud_ao.go +++ b/internal/certmgmt/deployers/sp_ctcccloud_ao.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ctcccloudao "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-ao" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-ao" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ctcccloudao.NewDeployer(&ctcccloudao.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_ctcccloud_cdn.go b/internal/certmgmt/deployers/sp_ctcccloud_cdn.go index 06b93718f..4d23b2b44 100644 --- a/internal/certmgmt/deployers/sp_ctcccloud_cdn.go +++ b/internal/certmgmt/deployers/sp_ctcccloud_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ctcccloudcdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ctcccloudcdn.NewDeployer(&ctcccloudcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_ctcccloud_cms.go b/internal/certmgmt/deployers/sp_ctcccloud_cms.go index 1ecf37d23..447b1e21e 100644 --- a/internal/certmgmt/deployers/sp_ctcccloud_cms.go +++ b/internal/certmgmt/deployers/sp_ctcccloud_cms.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ctcccloudcms "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-cms" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-cms" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ctcccloudcms.NewDeployer(&ctcccloudcms.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, }) diff --git a/internal/certmgmt/deployers/sp_ctcccloud_elb.go b/internal/certmgmt/deployers/sp_ctcccloud_elb.go index 7159146b9..6c16371a3 100644 --- a/internal/certmgmt/deployers/sp_ctcccloud_elb.go +++ b/internal/certmgmt/deployers/sp_ctcccloud_elb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ctcccloudelb "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-elb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-elb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ctcccloudelb.NewDeployer(&ctcccloudelb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), diff --git a/internal/certmgmt/deployers/sp_ctcccloud_faas.go b/internal/certmgmt/deployers/sp_ctcccloud_faas.go index 2eccd15c1..1734b60b5 100644 --- a/internal/certmgmt/deployers/sp_ctcccloud_faas.go +++ b/internal/certmgmt/deployers/sp_ctcccloud_faas.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ctcccloudfaas "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-faas" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-faas" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ctcccloudfaas.NewDeployer(&ctcccloudfaas.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), diff --git a/internal/certmgmt/deployers/sp_ctcccloud_icdn.go b/internal/certmgmt/deployers/sp_ctcccloud_icdn.go index aa2fcec5f..a889f97dd 100644 --- a/internal/certmgmt/deployers/sp_ctcccloud_icdn.go +++ b/internal/certmgmt/deployers/sp_ctcccloud_icdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ctcccloudicdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-icdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-icdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ctcccloudicdn.NewDeployer(&ctcccloudicdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_ctcccloud_lvdn.go b/internal/certmgmt/deployers/sp_ctcccloud_lvdn.go index f100d61f9..b05c86537 100644 --- a/internal/certmgmt/deployers/sp_ctcccloud_lvdn.go +++ b/internal/certmgmt/deployers/sp_ctcccloud_lvdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ctcccloudlvdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-lvdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ctcccloud-lvdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ctcccloudlvdn.NewDeployer(&ctcccloudlvdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_dogecloud_cdn.go b/internal/certmgmt/deployers/sp_dogecloud_cdn.go index d03fb751c..753a00e28 100644 --- a/internal/certmgmt/deployers/sp_dogecloud_cdn.go +++ b/internal/certmgmt/deployers/sp_dogecloud_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - pDogeCDN "github.com/certimate-go/certimate/pkg/core/deployer/providers/dogecloud-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/dogecloud-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := pDogeCDN.NewDeployer(&pDogeCDN.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKey: credentials.AccessKey, SecretKey: credentials.SecretKey, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_dokploy.go b/internal/certmgmt/deployers/sp_dokploy.go index 3e45118b6..e854386d1 100644 --- a/internal/certmgmt/deployers/sp_dokploy.go +++ b/internal/certmgmt/deployers/sp_dokploy.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/dokploy" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/dokploy" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dokploy.NewDeployer(&dokploy.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_flexcdn.go b/internal/certmgmt/deployers/sp_flexcdn.go index 883ca671a..12ecedcc8 100644 --- a/internal/certmgmt/deployers/sp_flexcdn.go +++ b/internal/certmgmt/deployers/sp_flexcdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/flexcdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/flexcdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := flexcdn.NewDeployer(&flexcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiRole: credentials.ApiRole, AccessKeyId: credentials.AccessKeyId, diff --git a/internal/certmgmt/deployers/sp_flyio.go b/internal/certmgmt/deployers/sp_flyio.go index c0f245f5a..f77bae55c 100644 --- a/internal/certmgmt/deployers/sp_flyio.go +++ b/internal/certmgmt/deployers/sp_flyio.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - flyio "github.com/certimate-go/certimate/pkg/core/deployer/providers/flyio" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/flyio" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := flyio.NewDeployer(&flyio.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiToken: credentials.ApiToken, AppName: xmaps.GetString(options.ProviderExtendedConfig, "appName"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), diff --git a/internal/certmgmt/deployers/sp_ftp.go b/internal/certmgmt/deployers/sp_ftp.go index d61a85a60..6d79428d7 100644 --- a/internal/certmgmt/deployers/sp_ftp.go +++ b/internal/certmgmt/deployers/sp_ftp.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/ftp" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ftp" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,12 +16,12 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ftp.NewDeployer(&ftp.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ FtpHost: credentials.Host, FtpPort: credentials.Port, FtpUsername: credentials.Username, FtpPassword: credentials.Password, - FileFormat: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "fileFormat", ftp.FILE_FORMAT_PEM), + FileFormat: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "fileFormat", dplyimpl.FILE_FORMAT_PEM), FilePathForKey: xmaps.GetString(options.ProviderExtendedConfig, "filePathForKey"), FilePathForCrt: xmaps.GetString(options.ProviderExtendedConfig, "filePathForCrt"), FilePathForCrtOnlyServer: xmaps.GetString(options.ProviderExtendedConfig, "filePathForCrtOnlyServer"), diff --git a/internal/certmgmt/deployers/sp_gcore_cdn.go b/internal/certmgmt/deployers/sp_gcore_cdn.go index da56dc6a0..c7ce85c39 100644 --- a/internal/certmgmt/deployers/sp_gcore_cdn.go +++ b/internal/certmgmt/deployers/sp_gcore_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - gcorecdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/gcore-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/gcore-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := gcorecdn.NewDeployer(&gcorecdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiToken: credentials.ApiToken, ResourceId: xmaps.GetInt64(options.ProviderExtendedConfig, "resourceId"), CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), diff --git a/internal/certmgmt/deployers/sp_goedge.go b/internal/certmgmt/deployers/sp_goedge.go index 8256acfdf..1f6a66818 100644 --- a/internal/certmgmt/deployers/sp_goedge.go +++ b/internal/certmgmt/deployers/sp_goedge.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/goedge" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/goedge" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := goedge.NewDeployer(&goedge.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiRole: credentials.ApiRole, AccessKeyId: credentials.AccessKeyId, diff --git a/internal/certmgmt/deployers/sp_huaweicloud_aad.go b/internal/certmgmt/deployers/sp_huaweicloud_aad.go index de12d9974..7aaa3ffcf 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_aad.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_aad.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - huaweicloudaad "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-aad" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-aad" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloudaad.NewDeployer(&huaweicloudaad.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, diff --git a/internal/certmgmt/deployers/sp_huaweicloud_apig.go b/internal/certmgmt/deployers/sp_huaweicloud_apig.go index b04d0713a..d7b49a532 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_apig.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_apig.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - huaweicloudapig "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-apig" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-apig" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloudapig.NewDeployer(&huaweicloudapig.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, diff --git a/internal/certmgmt/deployers/sp_huaweicloud_cdn.go b/internal/certmgmt/deployers/sp_huaweicloud_cdn.go index e774e9fb7..07277efd2 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_cdn.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - huaweicloudcdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloudcdn.NewDeployer(&huaweicloudcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, diff --git a/internal/certmgmt/deployers/sp_huaweicloud_elb.go b/internal/certmgmt/deployers/sp_huaweicloud_elb.go index 01c0a734f..7e760a58b 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_elb.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_elb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - huaweicloudelb "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-elb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-elb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloudelb.NewDeployer(&huaweicloudelb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, diff --git a/internal/certmgmt/deployers/sp_huaweicloud_live.go b/internal/certmgmt/deployers/sp_huaweicloud_live.go index 1ae86b6e4..486e853ec 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_live.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_live.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - huaweicloudlive "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-live" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-live" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloudlive.NewDeployer(&huaweicloudlive.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, diff --git a/internal/certmgmt/deployers/sp_huaweicloud_obs.go b/internal/certmgmt/deployers/sp_huaweicloud_obs.go index c08f8055f..04358f5e1 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_obs.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_obs.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - huaweicloudobs "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-obs" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-obs" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloudobs.NewDeployer(&huaweicloudobs.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), diff --git a/internal/certmgmt/deployers/sp_huaweicloud_scm.go b/internal/certmgmt/deployers/sp_huaweicloud_scm.go index 80e29becc..44166212a 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_scm.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_scm.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - huaweicloudscm "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-scm" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-scm" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloudscm.NewDeployer(&huaweicloudscm.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, diff --git a/internal/certmgmt/deployers/sp_huaweicloud_waf.go b/internal/certmgmt/deployers/sp_huaweicloud_waf.go index bd069d867..d54402715 100644 --- a/internal/certmgmt/deployers/sp_huaweicloud_waf.go +++ b/internal/certmgmt/deployers/sp_huaweicloud_waf.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - huaweicloudwaf "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-waf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/huaweicloud-waf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := huaweicloudwaf.NewDeployer(&huaweicloudwaf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, EnterpriseProjectId: credentials.EnterpriseProjectId, diff --git a/internal/certmgmt/deployers/sp_jdcloud_alb.go b/internal/certmgmt/deployers/sp_jdcloud_alb.go index 1190e6e6e..407f9d351 100644 --- a/internal/certmgmt/deployers/sp_jdcloud_alb.go +++ b/internal/certmgmt/deployers/sp_jdcloud_alb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - jdcloudalb "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-alb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-alb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := jdcloudalb.NewDeployer(&jdcloudalb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), diff --git a/internal/certmgmt/deployers/sp_jdcloud_cdn.go b/internal/certmgmt/deployers/sp_jdcloud_cdn.go index cb16bd1c9..b0e376ca1 100644 --- a/internal/certmgmt/deployers/sp_jdcloud_cdn.go +++ b/internal/certmgmt/deployers/sp_jdcloud_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - jdcloudcdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := jdcloudcdn.NewDeployer(&jdcloudcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_jdcloud_live.go b/internal/certmgmt/deployers/sp_jdcloud_live.go index 8a14ea435..7b151fb9a 100644 --- a/internal/certmgmt/deployers/sp_jdcloud_live.go +++ b/internal/certmgmt/deployers/sp_jdcloud_live.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - jdcloudlive "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-live" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-live" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := jdcloudlive.NewDeployer(&jdcloudlive.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_jdcloud_ssl.go b/internal/certmgmt/deployers/sp_jdcloud_ssl.go index c53a2bcf6..566127a6e 100644 --- a/internal/certmgmt/deployers/sp_jdcloud_ssl.go +++ b/internal/certmgmt/deployers/sp_jdcloud_ssl.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - jdcloudssl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-ssl" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-ssl" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := jdcloudssl.NewDeployer(&jdcloudssl.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, }) diff --git a/internal/certmgmt/deployers/sp_jdcloud_vod.go b/internal/certmgmt/deployers/sp_jdcloud_vod.go index 8e179313b..41a7d7c3e 100644 --- a/internal/certmgmt/deployers/sp_jdcloud_vod.go +++ b/internal/certmgmt/deployers/sp_jdcloud_vod.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - jdcloudvod "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-vod" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-vod" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := jdcloudvod.NewDeployer(&jdcloudvod.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_jdcloud_waf.go b/internal/certmgmt/deployers/sp_jdcloud_waf.go index 4e2f1614e..279db1258 100644 --- a/internal/certmgmt/deployers/sp_jdcloud_waf.go +++ b/internal/certmgmt/deployers/sp_jdcloud_waf.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - jdcloudwaf "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-waf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/jdcloud-waf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := jdcloudwaf.NewDeployer(&jdcloudwaf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, RegionId: xmaps.GetString(options.ProviderExtendedConfig, "regionId"), diff --git a/internal/certmgmt/deployers/sp_kong.go b/internal/certmgmt/deployers/sp_kong.go index 8134d12a5..70e0c87c2 100644 --- a/internal/certmgmt/deployers/sp_kong.go +++ b/internal/certmgmt/deployers/sp_kong.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/kong" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/kong" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := kong.NewDeployer(&kong.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiToken: credentials.ApiToken, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_ksyun_cdn.go b/internal/certmgmt/deployers/sp_ksyun_cdn.go index 2ad9a4681..f6bd8a99f 100644 --- a/internal/certmgmt/deployers/sp_ksyun_cdn.go +++ b/internal/certmgmt/deployers/sp_ksyun_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ksyuncdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/ksyun-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ksyun-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ksyuncdn.NewDeployer(&ksyuncdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), diff --git a/internal/certmgmt/deployers/sp_ksyun_slb.go b/internal/certmgmt/deployers/sp_ksyun_slb.go index b37eb62cd..68ccc5f3a 100644 --- a/internal/certmgmt/deployers/sp_ksyun_slb.go +++ b/internal/certmgmt/deployers/sp_ksyun_slb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ksyunslb "github.com/certimate-go/certimate/pkg/core/deployer/providers/ksyun-slb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ksyun-slb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ksyunslb.NewDeployer(&ksyunslb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), diff --git a/internal/certmgmt/deployers/sp_kubernetes_secret.go b/internal/certmgmt/deployers/sp_kubernetes_secret.go index d3558105c..eff4e5dd2 100644 --- a/internal/certmgmt/deployers/sp_kubernetes_secret.go +++ b/internal/certmgmt/deployers/sp_kubernetes_secret.go @@ -6,7 +6,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - k8ssecret "github.com/certimate-go/certimate/pkg/core/deployer/providers/k8s-secret" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/k8s-secret" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -61,7 +61,7 @@ func init() { secretLabels = temp } - provider, err := k8ssecret.NewDeployer(&k8ssecret.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ KubeConfig: credentials.KubeConfig, Namespace: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "namespace", "default"), SecretName: xmaps.GetString(options.ProviderExtendedConfig, "secretName"), diff --git a/internal/certmgmt/deployers/sp_lecdn.go b/internal/certmgmt/deployers/sp_lecdn.go index 25a106235..c3dbf872d 100644 --- a/internal/certmgmt/deployers/sp_lecdn.go +++ b/internal/certmgmt/deployers/sp_lecdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/lecdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/lecdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := lecdn.NewDeployer(&lecdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiVersion: credentials.ApiVersion, ApiRole: credentials.ApiRole, diff --git a/internal/certmgmt/deployers/sp_local.go b/internal/certmgmt/deployers/sp_local.go index c8fe1cee3..7f2a169cc 100644 --- a/internal/certmgmt/deployers/sp_local.go +++ b/internal/certmgmt/deployers/sp_local.go @@ -3,17 +3,17 @@ package deployers import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/local" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/local" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) func init() { Registries.MustRegister(domain.DeploymentProviderTypeLocal, func(options *ProviderFactoryOptions) (core.Deployer, error) { - provider, err := local.NewDeployer(&local.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ShellEnv: xmaps.GetString(options.ProviderExtendedConfig, "shellEnv"), PreCommand: xmaps.GetString(options.ProviderExtendedConfig, "preCommand"), PostCommand: xmaps.GetString(options.ProviderExtendedConfig, "postCommand"), - FileFormat: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "fileFormat", local.FILE_FORMAT_PEM), + FileFormat: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "fileFormat", dplyimpl.FILE_FORMAT_PEM), FilePathForKey: xmaps.GetString(options.ProviderExtendedConfig, "filePathForKey"), FilePathForCrt: xmaps.GetString(options.ProviderExtendedConfig, "filePathForCrt"), FilePathForCrtOnlyServer: xmaps.GetString(options.ProviderExtendedConfig, "filePathForCrtOnlyServer"), diff --git a/internal/certmgmt/deployers/sp_mohua_mvh.go b/internal/certmgmt/deployers/sp_mohua_mvh.go index 90b10d75b..8808bc967 100644 --- a/internal/certmgmt/deployers/sp_mohua_mvh.go +++ b/internal/certmgmt/deployers/sp_mohua_mvh.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - mohuamvh "github.com/certimate-go/certimate/pkg/core/deployer/providers/mohua-mvh" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/mohua-mvh" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := mohuamvh.NewDeployer(&mohuamvh.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ Username: credentials.Username, ApiPassword: credentials.ApiPassword, HostId: xmaps.GetString(options.ProviderExtendedConfig, "hostId"), diff --git a/internal/certmgmt/deployers/sp_netlify.go b/internal/certmgmt/deployers/sp_netlify.go index f439256c4..b9a08bd08 100644 --- a/internal/certmgmt/deployers/sp_netlify.go +++ b/internal/certmgmt/deployers/sp_netlify.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - netlify "github.com/certimate-go/certimate/pkg/core/deployer/providers/netlify" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/netlify" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := netlify.NewDeployer(&netlify.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiToken: credentials.ApiToken, DeployTarget: xmaps.GetString(options.ProviderExtendedConfig, "deployTarget"), SiteId: xmaps.GetString(options.ProviderExtendedConfig, "siteId"), diff --git a/internal/certmgmt/deployers/sp_nginxproxymanager.go b/internal/certmgmt/deployers/sp_nginxproxymanager.go index 2937186b1..b778eb12c 100644 --- a/internal/certmgmt/deployers/sp_nginxproxymanager.go +++ b/internal/certmgmt/deployers/sp_nginxproxymanager.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - nginxproxymanager "github.com/certimate-go/certimate/pkg/core/deployer/providers/nginxproxymanager" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/nginxproxymanager" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := nginxproxymanager.NewDeployer(&nginxproxymanager.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, AuthMethod: credentials.AuthMethod, Username: credentials.Username, diff --git a/internal/certmgmt/deployers/sp_proxmoxve.go b/internal/certmgmt/deployers/sp_proxmoxve.go index e74028ce2..e76d88b86 100644 --- a/internal/certmgmt/deployers/sp_proxmoxve.go +++ b/internal/certmgmt/deployers/sp_proxmoxve.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/proxmoxve" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/proxmoxve" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := proxmoxve.NewDeployer(&proxmoxve.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiToken: credentials.ApiToken, ApiTokenSecret: credentials.ApiTokenSecret, diff --git a/internal/certmgmt/deployers/sp_qiniu_cdn.go b/internal/certmgmt/deployers/sp_qiniu_cdn.go index 449a4b1c0..fe71ce8b4 100644 --- a/internal/certmgmt/deployers/sp_qiniu_cdn.go +++ b/internal/certmgmt/deployers/sp_qiniu_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - qiniucdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := qiniucdn.NewDeployer(&qiniucdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKey: credentials.AccessKey, SecretKey: credentials.SecretKey, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_qiniu_kodo.go b/internal/certmgmt/deployers/sp_qiniu_kodo.go index 3d9ff98d9..a12e7e7bd 100644 --- a/internal/certmgmt/deployers/sp_qiniu_kodo.go +++ b/internal/certmgmt/deployers/sp_qiniu_kodo.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - qiniukodo "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-kodo" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-kodo" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := qiniukodo.NewDeployer(&qiniukodo.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKey: credentials.AccessKey, SecretKey: credentials.SecretKey, Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), diff --git a/internal/certmgmt/deployers/sp_qiniu_pili.go b/internal/certmgmt/deployers/sp_qiniu_pili.go index 7a6651a63..4a5315e86 100644 --- a/internal/certmgmt/deployers/sp_qiniu_pili.go +++ b/internal/certmgmt/deployers/sp_qiniu_pili.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - qiniupili "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-pili" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/qiniu-pili" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := qiniupili.NewDeployer(&qiniupili.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKey: credentials.AccessKey, SecretKey: credentials.SecretKey, Hub: xmaps.GetString(options.ProviderExtendedConfig, "hub"), diff --git a/internal/certmgmt/deployers/sp_rainyun_rcdn.go b/internal/certmgmt/deployers/sp_rainyun_rcdn.go index ded297daa..ea6b484ba 100644 --- a/internal/certmgmt/deployers/sp_rainyun_rcdn.go +++ b/internal/certmgmt/deployers/sp_rainyun_rcdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - rainyunrcdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/rainyun-rcdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/rainyun-rcdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := rainyunrcdn.NewDeployer(&rainyunrcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiKey: credentials.ApiKey, InstanceId: xmaps.GetInt64(options.ProviderExtendedConfig, "instanceId"), DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_rainyun_sslcenter.go b/internal/certmgmt/deployers/sp_rainyun_sslcenter.go index 56b88c3fd..242321aa7 100644 --- a/internal/certmgmt/deployers/sp_rainyun_sslcenter.go +++ b/internal/certmgmt/deployers/sp_rainyun_sslcenter.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - rainyunsslcenter "github.com/certimate-go/certimate/pkg/core/deployer/providers/rainyun-sslcenter" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/rainyun-sslcenter" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := rainyunsslcenter.NewDeployer(&rainyunsslcenter.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiKey: credentials.ApiKey, CertificateId: xmaps.GetInt64(options.ProviderExtendedConfig, "certificateId"), }) diff --git a/internal/certmgmt/deployers/sp_ratpanel.go b/internal/certmgmt/deployers/sp_ratpanel.go index 889fb38c3..0639abd6d 100644 --- a/internal/certmgmt/deployers/sp_ratpanel.go +++ b/internal/certmgmt/deployers/sp_ratpanel.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ratpanel "github.com/certimate-go/certimate/pkg/core/deployer/providers/ratpanel" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ratpanel" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ratpanel.NewDeployer(&ratpanel.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, AccessTokenId: credentials.AccessTokenId, AccessToken: credentials.AccessToken, diff --git a/internal/certmgmt/deployers/sp_ratpanel_console.go b/internal/certmgmt/deployers/sp_ratpanel_console.go index 87d37782d..6ae04f6f3 100644 --- a/internal/certmgmt/deployers/sp_ratpanel_console.go +++ b/internal/certmgmt/deployers/sp_ratpanel_console.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ratpanelconsole "github.com/certimate-go/certimate/pkg/core/deployer/providers/ratpanel-console" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ratpanel-console" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ratpanelconsole.NewDeployer(&ratpanelconsole.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, AccessTokenId: credentials.AccessTokenId, AccessToken: credentials.AccessToken, diff --git a/internal/certmgmt/deployers/sp_s3.go b/internal/certmgmt/deployers/sp_s3.go index f67118f1d..5aed82433 100644 --- a/internal/certmgmt/deployers/sp_s3.go +++ b/internal/certmgmt/deployers/sp_s3.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/s3" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/s3" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := s3.NewDeployer(&s3.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ Endpoint: credentials.Endpoint, AccessKey: credentials.AccessKey, SecretKey: credentials.SecretKey, @@ -25,7 +25,7 @@ func init() { AllowInsecureConnections: credentials.AllowInsecureConnections, Region: xmaps.GetString(options.ProviderExtendedConfig, "region"), Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), - FileFormat: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "fileFormat", s3.FILE_FORMAT_PEM), + FileFormat: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "fileFormat", dplyimpl.FILE_FORMAT_PEM), ObjectKeyForKey: xmaps.GetString(options.ProviderExtendedConfig, "objectKeyForKey"), ObjectKeyForCrt: xmaps.GetString(options.ProviderExtendedConfig, "objectKeyForCrt"), ObjectKeyForCrtOnlyServer: xmaps.GetString(options.ProviderExtendedConfig, "objectKeyForCrtOnlyServer"), diff --git a/internal/certmgmt/deployers/sp_safeline.go b/internal/certmgmt/deployers/sp_safeline.go index 15bf2e680..8847ec481 100644 --- a/internal/certmgmt/deployers/sp_safeline.go +++ b/internal/certmgmt/deployers/sp_safeline.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/safeline" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/safeline" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := safeline.NewDeployer(&safeline.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiToken: credentials.ApiToken, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_samwaf.go b/internal/certmgmt/deployers/sp_samwaf.go index ba1940123..cd4b49f93 100644 --- a/internal/certmgmt/deployers/sp_samwaf.go +++ b/internal/certmgmt/deployers/sp_samwaf.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/samwaf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/samwaf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := samwaf.NewDeployer(&samwaf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, ApiKey: credentials.ApiKey, AllowInsecureConnections: credentials.AllowInsecureConnections, diff --git a/internal/certmgmt/deployers/sp_ssh.go b/internal/certmgmt/deployers/sp_ssh.go index c6a3ff90d..69602a67b 100644 --- a/internal/certmgmt/deployers/sp_ssh.go +++ b/internal/certmgmt/deployers/sp_ssh.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/ssh" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ssh" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,9 +16,9 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - jumpServers := make([]ssh.ServerConfig, len(credentials.JumpServers)) + jumpServers := make([]dplyimpl.ServerConfig, len(credentials.JumpServers)) for i, jumpServer := range credentials.JumpServers { - jumpServers[i] = ssh.ServerConfig{ + jumpServers[i] = dplyimpl.ServerConfig{ SshHost: jumpServer.Host, SshPort: jumpServer.Port, SshAuthMethod: jumpServer.AuthMethod, @@ -29,8 +29,8 @@ func init() { } } - provider, err := ssh.NewDeployer(&ssh.DeployerConfig{ - ServerConfig: ssh.ServerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ + ServerConfig: dplyimpl.ServerConfig{ SshHost: credentials.Host, SshPort: credentials.Port, SshAuthMethod: credentials.AuthMethod, @@ -43,7 +43,7 @@ func init() { UseSCP: xmaps.GetBool(options.ProviderExtendedConfig, "useSCP"), PreCommand: xmaps.GetString(options.ProviderExtendedConfig, "preCommand"), PostCommand: xmaps.GetString(options.ProviderExtendedConfig, "postCommand"), - FileFormat: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "fileFormat", ssh.FILE_FORMAT_PEM), + FileFormat: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "fileFormat", dplyimpl.FILE_FORMAT_PEM), FilePathForKey: xmaps.GetString(options.ProviderExtendedConfig, "filePathForKey"), FilePathForCrt: xmaps.GetString(options.ProviderExtendedConfig, "filePathForCrt"), FilePathForCrtOnlyServer: xmaps.GetString(options.ProviderExtendedConfig, "filePathForCrtOnlyServer"), diff --git a/internal/certmgmt/deployers/sp_synologydsm.go b/internal/certmgmt/deployers/sp_synologydsm.go index 07607be80..c2b9c3871 100644 --- a/internal/certmgmt/deployers/sp_synologydsm.go +++ b/internal/certmgmt/deployers/sp_synologydsm.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/deployer/providers/synologydsm" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/synologydsm" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := synologydsm.NewDeployer(&synologydsm.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ServerUrl: credentials.ServerUrl, Username: credentials.Username, Password: credentials.Password, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_cdn.go b/internal/certmgmt/deployers/sp_tencentcloud_cdn.go index 046e9a1c1..2c349da68 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_cdn.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudcdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudcdn.NewDeployer(&tencentcloudcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_clb.go b/internal/certmgmt/deployers/sp_tencentcloud_clb.go index 114678561..2676ec53e 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_clb.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_clb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudclb "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-clb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-clb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudclb.NewDeployer(&tencentcloudclb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_cos.go b/internal/certmgmt/deployers/sp_tencentcloud_cos.go index d63875a23..c31d1741d 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_cos.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_cos.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudcos "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-cos" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-cos" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudcos.NewDeployer(&tencentcloudcos.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_css.go b/internal/certmgmt/deployers/sp_tencentcloud_css.go index 8fc7f5d60..b92b53b77 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_css.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_css.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudcss "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-css" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-css" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudcss.NewDeployer(&tencentcloudcss.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_ecdn.go b/internal/certmgmt/deployers/sp_tencentcloud_ecdn.go index 6faca65bb..704c1ed7a 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_ecdn.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_ecdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudecdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ecdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ecdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudecdn.NewDeployer(&tencentcloudecdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_eo.go b/internal/certmgmt/deployers/sp_tencentcloud_eo.go index e57f1192d..b13f564f8 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_eo.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_eo.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudeo "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-eo" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-eo" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudeo.NewDeployer(&tencentcloudeo.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_gaap.go b/internal/certmgmt/deployers/sp_tencentcloud_gaap.go index 7ebe02a7d..c1044efd0 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_gaap.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_gaap.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudgaap "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-gaap" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-gaap" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudgaap.NewDeployer(&tencentcloudgaap.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_scf.go b/internal/certmgmt/deployers/sp_tencentcloud_scf.go index 80ff4c3b8..7bb009c17 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_scf.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_scf.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudscf "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-scf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-scf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudscf.NewDeployer(&tencentcloudscf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_ssl.go b/internal/certmgmt/deployers/sp_tencentcloud_ssl.go index 531953c2a..284551c2d 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_ssl.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_ssl.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudssl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ssl" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ssl" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudssl.NewDeployer(&tencentcloudssl.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_ssldeploy.go b/internal/certmgmt/deployers/sp_tencentcloud_ssldeploy.go index 34532f82e..8a6b5ab63 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_ssldeploy.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_ssldeploy.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudssldeploy "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ssl-deploy" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ssl-deploy" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudssldeploy.NewDeployer(&tencentcloudssldeploy.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_sslupdate.go b/internal/certmgmt/deployers/sp_tencentcloud_sslupdate.go index 7991e83fd..f15899ef7 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_sslupdate.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_sslupdate.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudsslupdate "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ssl-update" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-ssl-update" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudsslupdate.NewDeployer(&tencentcloudsslupdate.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_vod.go b/internal/certmgmt/deployers/sp_tencentcloud_vod.go index ae6bab140..d649d87b8 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_vod.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_vod.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudvod "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-vod" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-vod" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudvod.NewDeployer(&tencentcloudvod.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_tencentcloud_waf.go b/internal/certmgmt/deployers/sp_tencentcloud_waf.go index bcce0f8ba..d10bd01df 100644 --- a/internal/certmgmt/deployers/sp_tencentcloud_waf.go +++ b/internal/certmgmt/deployers/sp_tencentcloud_waf.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - tencentcloudwaf "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-waf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/tencentcloud-waf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := tencentcloudwaf.NewDeployer(&tencentcloudwaf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ SecretId: credentials.SecretId, SecretKey: credentials.SecretKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_ucloud_ualb.go b/internal/certmgmt/deployers/sp_ucloud_ualb.go index 9a111888f..469e5e34f 100644 --- a/internal/certmgmt/deployers/sp_ucloud_ualb.go +++ b/internal/certmgmt/deployers/sp_ucloud_ualb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ucloudualb "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-ualb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-ualb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ucloudualb.NewDeployer(&ucloudualb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ PrivateKey: credentials.PrivateKey, PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_ucloud_ucdn.go b/internal/certmgmt/deployers/sp_ucloud_ucdn.go index 44429297c..46a0f864d 100644 --- a/internal/certmgmt/deployers/sp_ucloud_ucdn.go +++ b/internal/certmgmt/deployers/sp_ucloud_ucdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - uclouducdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-ucdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-ucdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := uclouducdn.NewDeployer(&uclouducdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ PrivateKey: credentials.PrivateKey, PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_ucloud_uclb.go b/internal/certmgmt/deployers/sp_ucloud_uclb.go index 881780e03..cbe970598 100644 --- a/internal/certmgmt/deployers/sp_ucloud_uclb.go +++ b/internal/certmgmt/deployers/sp_ucloud_uclb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - uclouduclb "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-uclb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-uclb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := uclouduclb.NewDeployer(&uclouduclb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ PrivateKey: credentials.PrivateKey, PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_ucloud_uewaf.go b/internal/certmgmt/deployers/sp_ucloud_uewaf.go index b607e2a0c..0d576a6a1 100644 --- a/internal/certmgmt/deployers/sp_ucloud_uewaf.go +++ b/internal/certmgmt/deployers/sp_ucloud_uewaf.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - uclouduewaf "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-uewaf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-uewaf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := uclouduewaf.NewDeployer(&uclouduewaf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ PrivateKey: credentials.PrivateKey, PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_ucloud_upathx.go b/internal/certmgmt/deployers/sp_ucloud_upathx.go index 49c3eeacd..e0f7ac2bf 100644 --- a/internal/certmgmt/deployers/sp_ucloud_upathx.go +++ b/internal/certmgmt/deployers/sp_ucloud_upathx.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ucloudupathx "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-upathx" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-upathx" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ucloudupathx.NewDeployer(&ucloudupathx.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ PrivateKey: credentials.PrivateKey, PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_ucloud_us3.go b/internal/certmgmt/deployers/sp_ucloud_us3.go index ade55954d..439a12c05 100644 --- a/internal/certmgmt/deployers/sp_ucloud_us3.go +++ b/internal/certmgmt/deployers/sp_ucloud_us3.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - ucloudus3 "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-us3" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/ucloud-us3" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := ucloudus3.NewDeployer(&ucloudus3.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ PrivateKey: credentials.PrivateKey, PublicKey: credentials.PublicKey, ProjectId: credentials.ProjectId, diff --git a/internal/certmgmt/deployers/sp_unicloud_webhost.go b/internal/certmgmt/deployers/sp_unicloud_webhost.go index 495f70a27..4e267a989 100644 --- a/internal/certmgmt/deployers/sp_unicloud_webhost.go +++ b/internal/certmgmt/deployers/sp_unicloud_webhost.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - unicloudwebhost "github.com/certimate-go/certimate/pkg/core/deployer/providers/unicloud-webhost" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/unicloud-webhost" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := unicloudwebhost.NewDeployer(&unicloudwebhost.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ Username: credentials.Username, Password: credentials.Password, SpaceProvider: xmaps.GetString(options.ProviderExtendedConfig, "spaceProvider"), diff --git a/internal/certmgmt/deployers/sp_upyun_cdn.go b/internal/certmgmt/deployers/sp_upyun_cdn.go index a8ece45f3..aa74a6fe1 100644 --- a/internal/certmgmt/deployers/sp_upyun_cdn.go +++ b/internal/certmgmt/deployers/sp_upyun_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - upyuncdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/upyun-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/upyun-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := upyuncdn.NewDeployer(&upyuncdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ Username: credentials.Username, Password: credentials.Password, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_upyun_file.go b/internal/certmgmt/deployers/sp_upyun_file.go index b9093bf73..31880b933 100644 --- a/internal/certmgmt/deployers/sp_upyun_file.go +++ b/internal/certmgmt/deployers/sp_upyun_file.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - upyunfile "github.com/certimate-go/certimate/pkg/core/deployer/providers/upyun-file" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/upyun-file" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := upyunfile.NewDeployer(&upyunfile.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ Username: credentials.Username, Password: credentials.Password, Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), diff --git a/internal/certmgmt/deployers/sp_vercel.go b/internal/certmgmt/deployers/sp_vercel.go index c9ca65971..74032cd49 100644 --- a/internal/certmgmt/deployers/sp_vercel.go +++ b/internal/certmgmt/deployers/sp_vercel.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - vercel "github.com/certimate-go/certimate/pkg/core/deployer/providers/vercel" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/vercel" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := vercel.NewDeployer(&vercel.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ ApiAccessToken: credentials.ApiAccessToken, TeamId: credentials.TeamId, }) diff --git a/internal/certmgmt/deployers/sp_volcengine_alb.go b/internal/certmgmt/deployers/sp_volcengine_alb.go index 91a69fdcd..2e1a1995e 100644 --- a/internal/certmgmt/deployers/sp_volcengine_alb.go +++ b/internal/certmgmt/deployers/sp_volcengine_alb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcenginealb "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-alb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-alb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcenginealb.NewDeployer(&volcenginealb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_apig.go b/internal/certmgmt/deployers/sp_volcengine_apig.go index 551227414..09178a6d9 100644 --- a/internal/certmgmt/deployers/sp_volcengine_apig.go +++ b/internal/certmgmt/deployers/sp_volcengine_apig.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcengineapig "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-apig" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-apig" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcengineapig.NewDeployer(&volcengineapig.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_cdn.go b/internal/certmgmt/deployers/sp_volcengine_cdn.go index d1ace169a..a6c0229c9 100644 --- a/internal/certmgmt/deployers/sp_volcengine_cdn.go +++ b/internal/certmgmt/deployers/sp_volcengine_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcenginecdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcenginecdn.NewDeployer(&volcenginecdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_certcenter.go b/internal/certmgmt/deployers/sp_volcengine_certcenter.go index 0ded6004d..438a12a31 100644 --- a/internal/certmgmt/deployers/sp_volcengine_certcenter.go +++ b/internal/certmgmt/deployers/sp_volcengine_certcenter.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcenginecertcenter "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-certcenter" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-certcenter" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcenginecertcenter.NewDeployer(&volcenginecertcenter.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_clb.go b/internal/certmgmt/deployers/sp_volcengine_clb.go index 9ec0ab54b..e4ed18777 100644 --- a/internal/certmgmt/deployers/sp_volcengine_clb.go +++ b/internal/certmgmt/deployers/sp_volcengine_clb.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcengineclb "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-clb" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-clb" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcengineclb.NewDeployer(&volcengineclb.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_dcdn.go b/internal/certmgmt/deployers/sp_volcengine_dcdn.go index d850bd6e1..ac8208ee4 100644 --- a/internal/certmgmt/deployers/sp_volcengine_dcdn.go +++ b/internal/certmgmt/deployers/sp_volcengine_dcdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcenginedcdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-dcdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-dcdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcenginedcdn.NewDeployer(&volcenginedcdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_imagex.go b/internal/certmgmt/deployers/sp_volcengine_imagex.go index 6f31b0add..324d6431d 100644 --- a/internal/certmgmt/deployers/sp_volcengine_imagex.go +++ b/internal/certmgmt/deployers/sp_volcengine_imagex.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcengineimagex "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-imagex" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-imagex" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcengineimagex.NewDeployer(&volcengineimagex.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_live.go b/internal/certmgmt/deployers/sp_volcengine_live.go index 7d943d5f8..e44d4d1c0 100644 --- a/internal/certmgmt/deployers/sp_volcengine_live.go +++ b/internal/certmgmt/deployers/sp_volcengine_live.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcenginelive "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-live" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-live" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcenginelive.NewDeployer(&volcenginelive.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_tos.go b/internal/certmgmt/deployers/sp_volcengine_tos.go index c29fecf53..8fd5c297c 100644 --- a/internal/certmgmt/deployers/sp_volcengine_tos.go +++ b/internal/certmgmt/deployers/sp_volcengine_tos.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcenginetos "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-tos" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-tos" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcenginetos.NewDeployer(&volcenginetos.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_vod.go b/internal/certmgmt/deployers/sp_volcengine_vod.go index f1f3b74ba..095c04d58 100644 --- a/internal/certmgmt/deployers/sp_volcengine_vod.go +++ b/internal/certmgmt/deployers/sp_volcengine_vod.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcenginevod "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-vod" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-vod" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcenginevod.NewDeployer(&volcenginevod.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_volcengine_waf.go b/internal/certmgmt/deployers/sp_volcengine_waf.go index 35ec3aa52..297262c37 100644 --- a/internal/certmgmt/deployers/sp_volcengine_waf.go +++ b/internal/certmgmt/deployers/sp_volcengine_waf.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - volcenginewaf "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-waf" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/volcengine-waf" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := volcenginewaf.NewDeployer(&volcenginewaf.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, SecretAccessKey: credentials.SecretAccessKey, ProjectName: credentials.ProjectName, diff --git a/internal/certmgmt/deployers/sp_wangsu_cdn.go b/internal/certmgmt/deployers/sp_wangsu_cdn.go index a179bd84d..92577ba47 100644 --- a/internal/certmgmt/deployers/sp_wangsu_cdn.go +++ b/internal/certmgmt/deployers/sp_wangsu_cdn.go @@ -8,7 +8,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - wangsucdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -19,7 +19,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := wangsucdn.NewDeployer(&wangsucdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, DomainMatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "domainMatchPattern"), diff --git a/internal/certmgmt/deployers/sp_wangsu_cdnpro.go b/internal/certmgmt/deployers/sp_wangsu_cdnpro.go index 7604786c1..d3754c5fa 100644 --- a/internal/certmgmt/deployers/sp_wangsu_cdnpro.go +++ b/internal/certmgmt/deployers/sp_wangsu_cdnpro.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - wangsucdnpro "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-cdnpro" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-cdnpro" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := wangsucdnpro.NewDeployer(&wangsucdnpro.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, ApiKey: credentials.ApiKey, diff --git a/internal/certmgmt/deployers/sp_wangsu_certificate.go b/internal/certmgmt/deployers/sp_wangsu_certificate.go index 19f11324e..b63b4f4b4 100644 --- a/internal/certmgmt/deployers/sp_wangsu_certificate.go +++ b/internal/certmgmt/deployers/sp_wangsu_certificate.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - wangsucertificate "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-certificate" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/wangsu-certificate" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := wangsucertificate.NewDeployer(&wangsucertificate.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeySecret: credentials.AccessKeySecret, CertificateId: xmaps.GetString(options.ProviderExtendedConfig, "certificateId"), diff --git a/internal/certmgmt/deployers/sp_webhook.go b/internal/certmgmt/deployers/sp_webhook.go index 634e956cf..d21181857 100644 --- a/internal/certmgmt/deployers/sp_webhook.go +++ b/internal/certmgmt/deployers/sp_webhook.go @@ -6,7 +6,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - webhook "github.com/certimate-go/certimate/pkg/core/deployer/providers/webhook" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/webhook" xhttp "github.com/certimate-go/certimate/pkg/utils/http" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -38,7 +38,7 @@ func init() { } } - provider, err := webhook.NewDeployer(&webhook.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ WebhookUrl: credentials.Url, WebhookData: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "webhookData", credentials.DataString), Method: credentials.Method, diff --git a/internal/certmgmt/deployers/sp_zenlayer_cdn.go b/internal/certmgmt/deployers/sp_zenlayer_cdn.go index 82a0cd460..4adaf7db1 100644 --- a/internal/certmgmt/deployers/sp_zenlayer_cdn.go +++ b/internal/certmgmt/deployers/sp_zenlayer_cdn.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - zenlayercdn "github.com/certimate-go/certimate/pkg/core/deployer/providers/zenlayer-cdn" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/zenlayer-cdn" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := zenlayercdn.NewDeployer(&zenlayercdn.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeyPassword: credentials.AccessKeyPassword, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/certmgmt/deployers/sp_zenlayer_ga.go b/internal/certmgmt/deployers/sp_zenlayer_ga.go index 1d0970803..e0c3518e2 100644 --- a/internal/certmgmt/deployers/sp_zenlayer_ga.go +++ b/internal/certmgmt/deployers/sp_zenlayer_ga.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - zenlayerga "github.com/certimate-go/certimate/pkg/core/deployer/providers/zenlayer-ga" + dplyimpl "github.com/certimate-go/certimate/pkg/core/deployer/providers/zenlayer-ga" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := zenlayerga.NewDeployer(&zenlayerga.DeployerConfig{ + provider, err := dplyimpl.NewDeployer(&dplyimpl.DeployerConfig{ AccessKeyId: credentials.AccessKeyId, AccessKeyPassword: credentials.AccessKeyPassword, ResourceGroupId: credentials.ResourceGroupId, diff --git a/internal/notify/notifiers/sp_dingtalkbot.go b/internal/notify/notifiers/sp_dingtalkbot.go index f6ebdc471..d2eb73b9e 100644 --- a/internal/notify/notifiers/sp_dingtalkbot.go +++ b/internal/notify/notifiers/sp_dingtalkbot.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/notifier/providers/dingtalkbot" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/dingtalkbot" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := dingtalkbot.NewNotifier(&dingtalkbot.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ WebhookUrl: credentials.WebhookUrl, Secret: credentials.Secret, CustomPayload: credentials.CustomPayload, diff --git a/internal/notify/notifiers/sp_discordbot.go b/internal/notify/notifiers/sp_discordbot.go index 938a2dd20..79ca6c197 100644 --- a/internal/notify/notifiers/sp_discordbot.go +++ b/internal/notify/notifiers/sp_discordbot.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/notifier/providers/discordbot" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/discordbot" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := discordbot.NewNotifier(&discordbot.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ BotToken: credentials.BotToken, ChannelId: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "channelId", credentials.ChannelId), }) diff --git a/internal/notify/notifiers/sp_email.go b/internal/notify/notifiers/sp_email.go index 56a389334..10a491f5f 100644 --- a/internal/notify/notifiers/sp_email.go +++ b/internal/notify/notifiers/sp_email.go @@ -6,6 +6,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" "github.com/certimate-go/certimate/pkg/core/notifier/providers/email" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/email" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +17,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := email.NewNotifier(&email.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ SmtpHost: credentials.SmtpHost, SmtpPort: credentials.SmtpPort, SmtpTls: credentials.SmtpTls, diff --git a/internal/notify/notifiers/sp_larkbot.go b/internal/notify/notifiers/sp_larkbot.go index f41c7b875..a2fa6d64c 100644 --- a/internal/notify/notifiers/sp_larkbot.go +++ b/internal/notify/notifiers/sp_larkbot.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/notifier/providers/larkbot" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/larkbot" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := larkbot.NewNotifier(&larkbot.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ WebhookUrl: credentials.WebhookUrl, Secret: credentials.Secret, CustomPayload: credentials.CustomPayload, diff --git a/internal/notify/notifiers/sp_mattermost.go b/internal/notify/notifiers/sp_mattermost.go index ac7d49c56..44f1dc2db 100644 --- a/internal/notify/notifiers/sp_mattermost.go +++ b/internal/notify/notifiers/sp_mattermost.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/notifier/providers/mattermost" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/mattermost" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := mattermost.NewNotifier(&mattermost.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ ServerUrl: credentials.ServerUrl, Username: credentials.Username, Password: credentials.Password, diff --git a/internal/notify/notifiers/sp_slackbot.go b/internal/notify/notifiers/sp_slackbot.go index 06ffee12e..e94e2eec8 100644 --- a/internal/notify/notifiers/sp_slackbot.go +++ b/internal/notify/notifiers/sp_slackbot.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - slackbot "github.com/certimate-go/certimate/pkg/core/notifier/providers/slackbot" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/slackbot" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := slackbot.NewNotifier(&slackbot.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ BotToken: credentials.BotToken, ChannelId: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "channelId", credentials.ChannelId), }) diff --git a/internal/notify/notifiers/sp_telegrambot.go b/internal/notify/notifiers/sp_telegrambot.go index 35f758eea..28786f5e5 100644 --- a/internal/notify/notifiers/sp_telegrambot.go +++ b/internal/notify/notifiers/sp_telegrambot.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/notifier/providers/telegrambot" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/telegrambot" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := telegrambot.NewNotifier(&telegrambot.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ BotToken: credentials.BotToken, ChatId: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "chatId", credentials.ChatId), }) diff --git a/internal/notify/notifiers/sp_webhook.go b/internal/notify/notifiers/sp_webhook.go index e20f8f71f..6153f2c67 100644 --- a/internal/notify/notifiers/sp_webhook.go +++ b/internal/notify/notifiers/sp_webhook.go @@ -6,7 +6,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/notifier/providers/webhook" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/webhook" xhttp "github.com/certimate-go/certimate/pkg/utils/http" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -38,7 +38,7 @@ func init() { } } - provider, err := webhook.NewNotifier(&webhook.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ WebhookUrl: credentials.Url, WebhookData: xmaps.GetOrDefaultString(options.ProviderExtendedConfig, "webhookData", credentials.DataString), Method: credentials.Method, diff --git a/internal/notify/notifiers/sp_wecombot.go b/internal/notify/notifiers/sp_wecombot.go index 93cc682d8..2ee620788 100644 --- a/internal/notify/notifiers/sp_wecombot.go +++ b/internal/notify/notifiers/sp_wecombot.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - "github.com/certimate-go/certimate/pkg/core/notifier/providers/wecombot" + ntfyimpl "github.com/certimate-go/certimate/pkg/core/notifier/providers/wecombot" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,7 +16,7 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := wecombot.NewNotifier(&wecombot.NotifierConfig{ + provider, err := ntfyimpl.NewNotifier(&ntfyimpl.NotifierConfig{ WebhookUrl: credentials.WebhookUrl, CustomPayload: credentials.CustomPayload, }) diff --git a/pkg/core/certifier/challengers/dns01/35cn/35cn.go b/pkg/core/certifier/challengers/dns01/35cn/35cn.go index c7fa9d996..201be9eee 100644 --- a/pkg/core/certifier/challengers/dns01/35cn/35cn.go +++ b/pkg/core/certifier/challengers/dns01/35cn/35cn.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/com35" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/51dnscom/51dnscom.go b/pkg/core/certifier/challengers/dns01/51dnscom/51dnscom.go index 3b83095f8..b68115533 100644 --- a/pkg/core/certifier/challengers/dns01/51dnscom/51dnscom.go +++ b/pkg/core/certifier/challengers/dns01/51dnscom/51dnscom.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/dns51" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/acmedns/acmedns.go b/pkg/core/certifier/challengers/dns01/acmedns/acmedns.go index de91437db..8fb6a7a75 100644 --- a/pkg/core/certifier/challengers/dns01/acmedns/acmedns.go +++ b/pkg/core/certifier/challengers/dns01/acmedns/acmedns.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/acmedns" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -14,7 +14,7 @@ type ChallengerConfig struct { Credentials string `json:"credentials"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/acmehttpreq/acmehttpreq.go b/pkg/core/certifier/challengers/dns01/acmehttpreq/acmehttpreq.go index 49d7cbdae..0751ab3e0 100644 --- a/pkg/core/certifier/challengers/dns01/acmehttpreq/acmehttpreq.go +++ b/pkg/core/certifier/challengers/dns01/acmehttpreq/acmehttpreq.go @@ -7,7 +7,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/httpreq" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -18,7 +18,7 @@ type ChallengerConfig struct { DnsPropagationTimeout int `json:"dnsPropagationTimeout,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/akamai-edgedns/akamai_edgedns.go b/pkg/core/certifier/challengers/dns01/akamai-edgedns/akamai_edgedns.go index c4c1d711b..55e95be3f 100644 --- a/pkg/core/certifier/challengers/dns01/akamai-edgedns/akamai_edgedns.go +++ b/pkg/core/certifier/challengers/dns01/akamai-edgedns/akamai_edgedns.go @@ -4,8 +4,9 @@ import ( "time" "github.com/akamai/AkamaiOPEN-edgegrid-golang/v13/pkg/edgegrid" - "github.com/go-acme/lego/v5/challenge" "github.com/go-acme/lego/v5/providers/dns/edgedns" + + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -17,7 +18,7 @@ type ChallengerConfig struct { DnsTTL int } -func NewChallenger(config *ChallengerConfig) (challenge.Provider, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { edgegridConfig := &edgegrid.Config{ Host: config.Host, ClientToken: config.ClientToken, diff --git a/pkg/core/certifier/challengers/dns01/aliyun-esa/aliyun_esa.go b/pkg/core/certifier/challengers/dns01/aliyun-esa/aliyun_esa.go index cfc24f0d6..eb83ea8ea 100644 --- a/pkg/core/certifier/challengers/dns01/aliyun-esa/aliyun_esa.go +++ b/pkg/core/certifier/challengers/dns01/aliyun-esa/aliyun_esa.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/aliesa" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -17,7 +17,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/aliyun/aliyun.go b/pkg/core/certifier/challengers/dns01/aliyun/aliyun.go index 6c68ca0a8..2702f4c91 100644 --- a/pkg/core/certifier/challengers/dns01/aliyun/aliyun.go +++ b/pkg/core/certifier/challengers/dns01/aliyun/aliyun.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/alidns" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/arvancloud/arvancloud.go b/pkg/core/certifier/challengers/dns01/arvancloud/arvancloud.go index e27104dd5..558dd430a 100644 --- a/pkg/core/certifier/challengers/dns01/arvancloud/arvancloud.go +++ b/pkg/core/certifier/challengers/dns01/arvancloud/arvancloud.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/arvancloud" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/aws-lightsail/aws_lightsail.go b/pkg/core/certifier/challengers/dns01/aws-lightsail/aws_lightsail.go index 2ffd47837..c7fe406c9 100644 --- a/pkg/core/certifier/challengers/dns01/aws-lightsail/aws_lightsail.go +++ b/pkg/core/certifier/challengers/dns01/aws-lightsail/aws_lightsail.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/aws-lightsail/internal" ) @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/aws-lightsail/internal/lego.go b/pkg/core/certifier/challengers/dns01/aws-lightsail/internal/lego.go index 91187f045..c4e3fd719 100644 --- a/pkg/core/certifier/challengers/dns01/aws-lightsail/internal/lego.go +++ b/pkg/core/certifier/challengers/dns01/aws-lightsail/internal/lego.go @@ -1,4 +1,4 @@ -package internal +package internal import ( "context" diff --git a/pkg/core/certifier/challengers/dns01/aws-route53/aws_route53.go b/pkg/core/certifier/challengers/dns01/aws-route53/aws_route53.go index df74d15eb..8a2bcfd8a 100644 --- a/pkg/core/certifier/challengers/dns01/aws-route53/aws_route53.go +++ b/pkg/core/certifier/challengers/dns01/aws-route53/aws_route53.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/route53" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -18,7 +18,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/azure-dns/azure_dns.go b/pkg/core/certifier/challengers/dns01/azure-dns/azure_dns.go index 84b3ecd36..66e744a0e 100644 --- a/pkg/core/certifier/challengers/dns01/azure-dns/azure_dns.go +++ b/pkg/core/certifier/challengers/dns01/azure-dns/azure_dns.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/azuredns" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" azenv "github.com/certimate-go/certimate/pkg/sdk3rd/azure/env" ) @@ -21,7 +21,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/baiducloud/baiducloud.go b/pkg/core/certifier/challengers/dns01/baiducloud/baiducloud.go index 2223e900d..7c6258ef3 100644 --- a/pkg/core/certifier/challengers/dns01/baiducloud/baiducloud.go +++ b/pkg/core/certifier/challengers/dns01/baiducloud/baiducloud.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/baiducloud" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/beget/beget.go b/pkg/core/certifier/challengers/dns01/beget/beget.go index e2e8dcc47..64dc92c59 100644 --- a/pkg/core/certifier/challengers/dns01/beget/beget.go +++ b/pkg/core/certifier/challengers/dns01/beget/beget.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/beget" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/bookmyname/bookmyname.go b/pkg/core/certifier/challengers/dns01/bookmyname/bookmyname.go index d20d4afe0..3311fb9e0 100644 --- a/pkg/core/certifier/challengers/dns01/bookmyname/bookmyname.go +++ b/pkg/core/certifier/challengers/dns01/bookmyname/bookmyname.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/bookmyname" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/bunny/bunny.go b/pkg/core/certifier/challengers/dns01/bunny/bunny.go index 058690f5d..cd6c7ff6b 100644 --- a/pkg/core/certifier/challengers/dns01/bunny/bunny.go +++ b/pkg/core/certifier/challengers/dns01/bunny/bunny.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/bunny" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/byteplus/byteplus.go b/pkg/core/certifier/challengers/dns01/byteplus/byteplus.go index cdaeb170f..b2afd728d 100644 --- a/pkg/core/certifier/challengers/dns01/byteplus/byteplus.go +++ b/pkg/core/certifier/challengers/dns01/byteplus/byteplus.go @@ -6,7 +6,7 @@ import ( "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/byteplus/internal" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/byteplus/internal/lego.go b/pkg/core/certifier/challengers/dns01/byteplus/internal/lego.go index c23b4584a..39bdcf063 100644 --- a/pkg/core/certifier/challengers/dns01/byteplus/internal/lego.go +++ b/pkg/core/certifier/challengers/dns01/byteplus/internal/lego.go @@ -1,4 +1,4 @@ -package internal +package internal import ( "context" diff --git a/pkg/core/certifier/challengers/dns01/cloudflare/cloudflare.go b/pkg/core/certifier/challengers/dns01/cloudflare/cloudflare.go index 14044087e..6341af780 100644 --- a/pkg/core/certifier/challengers/dns01/cloudflare/cloudflare.go +++ b/pkg/core/certifier/challengers/dns01/cloudflare/cloudflare.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/cloudflare" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/cloudns/cloudns.go b/pkg/core/certifier/challengers/dns01/cloudns/cloudns.go index 96edb8cf9..86b38bc6f 100644 --- a/pkg/core/certifier/challengers/dns01/cloudns/cloudns.go +++ b/pkg/core/certifier/challengers/dns01/cloudns/cloudns.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/cloudns" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/cmcccloud/cmcccloud.go b/pkg/core/certifier/challengers/dns01/cmcccloud/cmcccloud.go index 63a55f020..d210fecda 100644 --- a/pkg/core/certifier/challengers/dns01/cmcccloud/cmcccloud.go +++ b/pkg/core/certifier/challengers/dns01/cmcccloud/cmcccloud.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/cmcccloud/internal" ) @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/conohavpsv2/conohavpsv2.go b/pkg/core/certifier/challengers/dns01/conohavpsv2/conohavpsv2.go index 61c73c918..aef3aa298 100644 --- a/pkg/core/certifier/challengers/dns01/conohavpsv2/conohavpsv2.go +++ b/pkg/core/certifier/challengers/dns01/conohavpsv2/conohavpsv2.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/conoha" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -17,7 +17,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/conohavpsv3/conohavpsv3.go b/pkg/core/certifier/challengers/dns01/conohavpsv3/conohavpsv3.go index 6e2f0b209..01fd6ef4d 100644 --- a/pkg/core/certifier/challengers/dns01/conohavpsv3/conohavpsv3.go +++ b/pkg/core/certifier/challengers/dns01/conohavpsv3/conohavpsv3.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/conohavpsv3/internal" ) @@ -18,7 +18,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/conohavpsv3/internal/lego.go b/pkg/core/certifier/challengers/dns01/conohavpsv3/internal/lego.go index 103efe19d..8a9a83d04 100644 --- a/pkg/core/certifier/challengers/dns01/conohavpsv3/internal/lego.go +++ b/pkg/core/certifier/challengers/dns01/conohavpsv3/internal/lego.go @@ -1,4 +1,4 @@ -package internal +package internal import ( "context" diff --git a/pkg/core/certifier/challengers/dns01/constellix/constellix.go b/pkg/core/certifier/challengers/dns01/constellix/constellix.go index cd4d3c4aa..e177ca127 100644 --- a/pkg/core/certifier/challengers/dns01/constellix/constellix.go +++ b/pkg/core/certifier/challengers/dns01/constellix/constellix.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/constellix" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/cpanel/cpanel.go b/pkg/core/certifier/challengers/dns01/cpanel/cpanel.go index 233fc6155..e4375b474 100644 --- a/pkg/core/certifier/challengers/dns01/cpanel/cpanel.go +++ b/pkg/core/certifier/challengers/dns01/cpanel/cpanel.go @@ -7,7 +7,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/cpanel" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" xhttp "github.com/certimate-go/certimate/pkg/utils/http" ) @@ -20,7 +20,7 @@ type ChallengerConfig struct { AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/ctcccloud/ctcccloud.go b/pkg/core/certifier/challengers/dns01/ctcccloud/ctcccloud.go index bc3b0c6af..1f86516b2 100644 --- a/pkg/core/certifier/challengers/dns01/ctcccloud/ctcccloud.go +++ b/pkg/core/certifier/challengers/dns01/ctcccloud/ctcccloud.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/ctcccloud/internal" ) @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/desec/desec.go b/pkg/core/certifier/challengers/dns01/desec/desec.go index 5913aa3d0..ee13ddb6c 100644 --- a/pkg/core/certifier/challengers/dns01/desec/desec.go +++ b/pkg/core/certifier/challengers/dns01/desec/desec.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/desec" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/digitalocean/digitalocean.go b/pkg/core/certifier/challengers/dns01/digitalocean/digitalocean.go index 050fa905a..122064e44 100644 --- a/pkg/core/certifier/challengers/dns01/digitalocean/digitalocean.go +++ b/pkg/core/certifier/challengers/dns01/digitalocean/digitalocean.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/digitalocean" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/dnsexit/dnsexit.go b/pkg/core/certifier/challengers/dns01/dnsexit/dnsexit.go index 10adb3f1b..f51c0fe90 100644 --- a/pkg/core/certifier/challengers/dns01/dnsexit/dnsexit.go +++ b/pkg/core/certifier/challengers/dns01/dnsexit/dnsexit.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/dnsexit" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/dnsla/dnsla.go b/pkg/core/certifier/challengers/dns01/dnsla/dnsla.go index 0bf6b1598..077f19c3e 100644 --- a/pkg/core/certifier/challengers/dns01/dnsla/dnsla.go +++ b/pkg/core/certifier/challengers/dns01/dnsla/dnsla.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/dnsla" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/dnsmadeeasy/dnsmadeeasy.go b/pkg/core/certifier/challengers/dns01/dnsmadeeasy/dnsmadeeasy.go index b1247caae..304a1210f 100644 --- a/pkg/core/certifier/challengers/dns01/dnsmadeeasy/dnsmadeeasy.go +++ b/pkg/core/certifier/challengers/dns01/dnsmadeeasy/dnsmadeeasy.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/dnsmadeeasy" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/duckdns/duckdns.go b/pkg/core/certifier/challengers/dns01/duckdns/duckdns.go index ff37a64ac..8ab060e60 100644 --- a/pkg/core/certifier/challengers/dns01/duckdns/duckdns.go +++ b/pkg/core/certifier/challengers/dns01/duckdns/duckdns.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/duckdns" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -14,7 +14,7 @@ type ChallengerConfig struct { DnsPropagationTimeout int `json:"dnsPropagationTimeout,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/dynadot/dynadot.go b/pkg/core/certifier/challengers/dns01/dynadot/dynadot.go index cbe493af4..7c4be7db1 100644 --- a/pkg/core/certifier/challengers/dns01/dynadot/dynadot.go +++ b/pkg/core/certifier/challengers/dns01/dynadot/dynadot.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/dynadot" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/dynu/dynu.go b/pkg/core/certifier/challengers/dns01/dynu/dynu.go index feaedeae3..07d27c341 100644 --- a/pkg/core/certifier/challengers/dns01/dynu/dynu.go +++ b/pkg/core/certifier/challengers/dns01/dynu/dynu.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/dynu" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/dynv6/dynv6.go b/pkg/core/certifier/challengers/dns01/dynv6/dynv6.go index 44272a8c6..b91e0eee0 100644 --- a/pkg/core/certifier/challengers/dns01/dynv6/dynv6.go +++ b/pkg/core/certifier/challengers/dns01/dynv6/dynv6.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/dynv6/internal" ) @@ -14,7 +14,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/gandinet/gandinet.go b/pkg/core/certifier/challengers/dns01/gandinet/gandinet.go index 3d2ccccc0..6233bdd3d 100644 --- a/pkg/core/certifier/challengers/dns01/gandinet/gandinet.go +++ b/pkg/core/certifier/challengers/dns01/gandinet/gandinet.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/gandiv5" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/gcore/gcore.go b/pkg/core/certifier/challengers/dns01/gcore/gcore.go index ff9eec4af..97b37dbd5 100644 --- a/pkg/core/certifier/challengers/dns01/gcore/gcore.go +++ b/pkg/core/certifier/challengers/dns01/gcore/gcore.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/gcore" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/gname/gname.go b/pkg/core/certifier/challengers/dns01/gname/gname.go index b766ab14f..e8b22c026 100644 --- a/pkg/core/certifier/challengers/dns01/gname/gname.go +++ b/pkg/core/certifier/challengers/dns01/gname/gname.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/gname" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/godaddy/godaddy.go b/pkg/core/certifier/challengers/dns01/godaddy/godaddy.go index 2e3e046ec..f103be3e3 100644 --- a/pkg/core/certifier/challengers/dns01/godaddy/godaddy.go +++ b/pkg/core/certifier/challengers/dns01/godaddy/godaddy.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/godaddy" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/hetzner/hetzner.go b/pkg/core/certifier/challengers/dns01/hetzner/hetzner.go index e00c9bb73..1d1197aa1 100644 --- a/pkg/core/certifier/challengers/dns01/hetzner/hetzner.go +++ b/pkg/core/certifier/challengers/dns01/hetzner/hetzner.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/hetzner" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/hostingde/hostingde.go b/pkg/core/certifier/challengers/dns01/hostingde/hostingde.go index 7bf667dd4..7c8812a37 100644 --- a/pkg/core/certifier/challengers/dns01/hostingde/hostingde.go +++ b/pkg/core/certifier/challengers/dns01/hostingde/hostingde.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/hostingde" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/hostinger/hostinger.go b/pkg/core/certifier/challengers/dns01/hostinger/hostinger.go index 895a544a0..4fc76cedc 100644 --- a/pkg/core/certifier/challengers/dns01/hostinger/hostinger.go +++ b/pkg/core/certifier/challengers/dns01/hostinger/hostinger.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/hostinger" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/huaweicloud/huaweicloud.go b/pkg/core/certifier/challengers/dns01/huaweicloud/huaweicloud.go index a43b3263e..cd695b63c 100644 --- a/pkg/core/certifier/challengers/dns01/huaweicloud/huaweicloud.go +++ b/pkg/core/certifier/challengers/dns01/huaweicloud/huaweicloud.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/huaweicloud" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -17,7 +17,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/infomaniak/infomaniak.go b/pkg/core/certifier/challengers/dns01/infomaniak/infomaniak.go index e78cdcdf9..db48112c2 100644 --- a/pkg/core/certifier/challengers/dns01/infomaniak/infomaniak.go +++ b/pkg/core/certifier/challengers/dns01/infomaniak/infomaniak.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/infomaniak" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/ionos/ionos.go b/pkg/core/certifier/challengers/dns01/ionos/ionos.go index ddc7201e2..4772c44d5 100644 --- a/pkg/core/certifier/challengers/dns01/ionos/ionos.go +++ b/pkg/core/certifier/challengers/dns01/ionos/ionos.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/ionos" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/jdcloud/jdcloud.go b/pkg/core/certifier/challengers/dns01/jdcloud/jdcloud.go index 10a12637b..f37bc29b0 100644 --- a/pkg/core/certifier/challengers/dns01/jdcloud/jdcloud.go +++ b/pkg/core/certifier/challengers/dns01/jdcloud/jdcloud.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/jdcloud" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -17,7 +17,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/linode/linode.go b/pkg/core/certifier/challengers/dns01/linode/linode.go index 4642b38b3..d18e84ac0 100644 --- a/pkg/core/certifier/challengers/dns01/linode/linode.go +++ b/pkg/core/certifier/challengers/dns01/linode/linode.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/linode" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/namecheap/namecheap.go b/pkg/core/certifier/challengers/dns01/namecheap/namecheap.go index 31e6c6562..28f94beef 100644 --- a/pkg/core/certifier/challengers/dns01/namecheap/namecheap.go +++ b/pkg/core/certifier/challengers/dns01/namecheap/namecheap.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/namecheap" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/namedotcom/namedotcom.go b/pkg/core/certifier/challengers/dns01/namedotcom/namedotcom.go index 2d5d7825c..1f3f12b34 100644 --- a/pkg/core/certifier/challengers/dns01/namedotcom/namedotcom.go +++ b/pkg/core/certifier/challengers/dns01/namedotcom/namedotcom.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/namedotcom" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/namesilo/namesilo.go b/pkg/core/certifier/challengers/dns01/namesilo/namesilo.go index e31781ba9..055a630e6 100644 --- a/pkg/core/certifier/challengers/dns01/namesilo/namesilo.go +++ b/pkg/core/certifier/challengers/dns01/namesilo/namesilo.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/namesilo" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/netcup/netcup.go b/pkg/core/certifier/challengers/dns01/netcup/netcup.go index c1e06043e..2e292c74a 100644 --- a/pkg/core/certifier/challengers/dns01/netcup/netcup.go +++ b/pkg/core/certifier/challengers/dns01/netcup/netcup.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/netcup" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -17,7 +17,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/netlify/netlify.go b/pkg/core/certifier/challengers/dns01/netlify/netlify.go index 00474d501..019c3570d 100644 --- a/pkg/core/certifier/challengers/dns01/netlify/netlify.go +++ b/pkg/core/certifier/challengers/dns01/netlify/netlify.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/netlify" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/ns1/ns1.go b/pkg/core/certifier/challengers/dns01/ns1/ns1.go index e5dfb622d..b4696d9ca 100644 --- a/pkg/core/certifier/challengers/dns01/ns1/ns1.go +++ b/pkg/core/certifier/challengers/dns01/ns1/ns1.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/ns1" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/ovhcloud/ovhcloud.go b/pkg/core/certifier/challengers/dns01/ovhcloud/ovhcloud.go index cb3f9feda..38e45db14 100644 --- a/pkg/core/certifier/challengers/dns01/ovhcloud/ovhcloud.go +++ b/pkg/core/certifier/challengers/dns01/ovhcloud/ovhcloud.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/ovh" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -21,7 +21,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/porkbun/porkbun.go b/pkg/core/certifier/challengers/dns01/porkbun/porkbun.go index ab96b7fee..e7a00f5bc 100644 --- a/pkg/core/certifier/challengers/dns01/porkbun/porkbun.go +++ b/pkg/core/certifier/challengers/dns01/porkbun/porkbun.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/porkbun" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/powerdns/powerdns.go b/pkg/core/certifier/challengers/dns01/powerdns/powerdns.go index 6e3a72ae5..19f589bf0 100644 --- a/pkg/core/certifier/challengers/dns01/powerdns/powerdns.go +++ b/pkg/core/certifier/challengers/dns01/powerdns/powerdns.go @@ -8,7 +8,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/pdns" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" xhttp "github.com/certimate-go/certimate/pkg/utils/http" ) @@ -20,7 +20,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/qingcloud/qingcloud.go b/pkg/core/certifier/challengers/dns01/qingcloud/qingcloud.go index 3908c0de4..e2c813f69 100644 --- a/pkg/core/certifier/challengers/dns01/qingcloud/qingcloud.go +++ b/pkg/core/certifier/challengers/dns01/qingcloud/qingcloud.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" "github.com/certimate-go/certimate/pkg/core/certifier/challengers/dns01/qingcloud/internal" ) @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/rainyun/rainyun.go b/pkg/core/certifier/challengers/dns01/rainyun/rainyun.go index 962b38f31..50dc4699b 100644 --- a/pkg/core/certifier/challengers/dns01/rainyun/rainyun.go +++ b/pkg/core/certifier/challengers/dns01/rainyun/rainyun.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/rainyun" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/regru/regru.go b/pkg/core/certifier/challengers/dns01/regru/regru.go index 07ab413ef..f623cffe3 100644 --- a/pkg/core/certifier/challengers/dns01/regru/regru.go +++ b/pkg/core/certifier/challengers/dns01/regru/regru.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/regru" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -18,7 +18,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/rfc2136/rfc2136.go b/pkg/core/certifier/challengers/dns01/rfc2136/rfc2136.go index 709754c7f..93bf5a2d7 100644 --- a/pkg/core/certifier/challengers/dns01/rfc2136/rfc2136.go +++ b/pkg/core/certifier/challengers/dns01/rfc2136/rfc2136.go @@ -8,7 +8,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/dnsupdate" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -21,7 +21,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/rucenter/rucenter.go b/pkg/core/certifier/challengers/dns01/rucenter/rucenter.go index 442bc3391..11d164b86 100644 --- a/pkg/core/certifier/challengers/dns01/rucenter/rucenter.go +++ b/pkg/core/certifier/challengers/dns01/rucenter/rucenter.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/nicru" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -18,7 +18,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/spaceship/spaceship.go b/pkg/core/certifier/challengers/dns01/spaceship/spaceship.go index b42fa569a..6b02d797e 100644 --- a/pkg/core/certifier/challengers/dns01/spaceship/spaceship.go +++ b/pkg/core/certifier/challengers/dns01/spaceship/spaceship.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/spaceship" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/technitiumdns/technitiumdns.go b/pkg/core/certifier/challengers/dns01/technitiumdns/technitiumdns.go index 1a957e536..71917d567 100644 --- a/pkg/core/certifier/challengers/dns01/technitiumdns/technitiumdns.go +++ b/pkg/core/certifier/challengers/dns01/technitiumdns/technitiumdns.go @@ -7,7 +7,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/technitium" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" xhttp "github.com/certimate-go/certimate/pkg/utils/http" ) @@ -19,7 +19,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/tencentcloud-eo/tencentcloud_eo.go b/pkg/core/certifier/challengers/dns01/tencentcloud-eo/tencentcloud_eo.go index ef1c4996c..62c77b378 100644 --- a/pkg/core/certifier/challengers/dns01/tencentcloud-eo/tencentcloud_eo.go +++ b/pkg/core/certifier/challengers/dns01/tencentcloud-eo/tencentcloud_eo.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/edgeone" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/tencentcloud/tencentcloud.go b/pkg/core/certifier/challengers/dns01/tencentcloud/tencentcloud.go index 3f57bcb32..07109e77b 100644 --- a/pkg/core/certifier/challengers/dns01/tencentcloud/tencentcloud.go +++ b/pkg/core/certifier/challengers/dns01/tencentcloud/tencentcloud.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/tencentcloud" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/todaynic/todaynic.go b/pkg/core/certifier/challengers/dns01/todaynic/todaynic.go index 7b3e3aee9..db466d7df 100644 --- a/pkg/core/certifier/challengers/dns01/todaynic/todaynic.go +++ b/pkg/core/certifier/challengers/dns01/todaynic/todaynic.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/todaynic" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/ucloud/ucloud.go b/pkg/core/certifier/challengers/dns01/ucloud/ucloud.go index c94c0df11..a7a794b83 100644 --- a/pkg/core/certifier/challengers/dns01/ucloud/ucloud.go +++ b/pkg/core/certifier/challengers/dns01/ucloud/ucloud.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/ucloud" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -17,7 +17,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("config is nil") } diff --git a/pkg/core/certifier/challengers/dns01/vercel/vercel.go b/pkg/core/certifier/challengers/dns01/vercel/vercel.go index 938f249c9..12d48708a 100644 --- a/pkg/core/certifier/challengers/dns01/vercel/vercel.go +++ b/pkg/core/certifier/challengers/dns01/vercel/vercel.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/vercel" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/volcengine/volcengine.go b/pkg/core/certifier/challengers/dns01/volcengine/volcengine.go index 021486ea3..bf92ee0fd 100644 --- a/pkg/core/certifier/challengers/dns01/volcengine/volcengine.go +++ b/pkg/core/certifier/challengers/dns01/volcengine/volcengine.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/volcengine" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/vultr/vultr.go b/pkg/core/certifier/challengers/dns01/vultr/vultr.go index 7bd4f2462..1021f4090 100644 --- a/pkg/core/certifier/challengers/dns01/vultr/vultr.go +++ b/pkg/core/certifier/challengers/dns01/vultr/vultr.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/vultr" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -15,7 +15,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/westcn/westcn.go b/pkg/core/certifier/challengers/dns01/westcn/westcn.go index a2c64bb22..3724d3b50 100644 --- a/pkg/core/certifier/challengers/dns01/westcn/westcn.go +++ b/pkg/core/certifier/challengers/dns01/westcn/westcn.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/westcn" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/dns01/xinnet/xinnet.go b/pkg/core/certifier/challengers/dns01/xinnet/xinnet.go index 7436f9c7e..8f8ef4529 100644 --- a/pkg/core/certifier/challengers/dns01/xinnet/xinnet.go +++ b/pkg/core/certifier/challengers/dns01/xinnet/xinnet.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v5/providers/dns/xinnet" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -16,7 +16,7 @@ type ChallengerConfig struct { DnsTTL int `json:"dnsTTL,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/http01/ftp/ftp.go b/pkg/core/certifier/challengers/http01/ftp/ftp.go index 40ce2d2cc..5f58df5f3 100644 --- a/pkg/core/certifier/challengers/http01/ftp/ftp.go +++ b/pkg/core/certifier/challengers/http01/ftp/ftp.go @@ -1,14 +1,10 @@ package ftp import ( - "context" "fmt" - "path/filepath" - "github.com/go-acme/lego/v5/challenge/http01" - - "github.com/certimate-go/certimate/internal/tools/ftp" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" + "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/ftp/internal" ) type ChallengerConfig struct { @@ -25,75 +21,22 @@ type ChallengerConfig struct { WebRootPath string `json:"webRootPath"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } - provider := &provider{config: config} - return provider, nil -} + providerConfig := internal.NewDefaultConfig() + providerConfig.Host = config.FtpHost + providerConfig.Port = int(config.FtpPort) + providerConfig.Username = config.FtpUsername + providerConfig.Password = config.FtpPassword + providerConfig.WebRootPath = config.WebRootPath -type provider struct { - config *ChallengerConfig -} - -func (p *provider) Present(ctx context.Context, domain, token, keyAuth string) error { - client, err := createFtpClient(*p.config) - if err != nil { - return fmt.Errorf("ftp: failed to create FTP client: %w", err) - } - - defer client.Quit() - - challengePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token)) - challengeDir := filepath.Dir(challengePath) - challengeFile := filepath.Base(challengePath) - if err := client.MkdirAll(ctx, challengeDir); err != nil { - return fmt.Errorf("ftp: failed to create the \".well-known\" directory: %w", err) - } - if err := client.ChangeDir(ctx, challengeDir); err != nil { - return fmt.Errorf("ftp: failed to change to the \".well-known\" directory: %w", err) - } - if err := client.StoreString(ctx, challengeFile, keyAuth); err != nil { - return fmt.Errorf("ftp: failed to write file for HTTP challenge: %w", err) - } - - return nil -} - -func (p *provider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { - client, err := createFtpClient(*p.config) - if err != nil { - return fmt.Errorf("ftp: failed to create FTP client: %w", err) - } - - defer client.Quit() - - challengePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token)) - challengeDir := filepath.Dir(challengePath) - challengeFile := filepath.Base(challengePath) - if err := client.ChangeDir(ctx, challengeDir); err != nil { - return fmt.Errorf("ftp: failed to change to the \".well-known\" directory: %w", err) - } - if err := client.Delete(ctx, challengeFile); err != nil { - return fmt.Errorf("ftp: failed to remove file after HTTP challenge: %w", err) - } - - return nil -} - -func createFtpClient(config ChallengerConfig) (*ftp.Client, error) { - clientCfg := ftp.NewDefaultConfig() - clientCfg.Host = config.FtpHost - clientCfg.Port = int(config.FtpPort) - clientCfg.Username = config.FtpUsername - clientCfg.Password = config.FtpPassword - - client, err := ftp.NewClient(clientCfg) + provider, err := internal.NewHTTPProviderConfig(providerConfig) if err != nil { return nil, err } - return client, nil + return provider, nil } diff --git a/pkg/core/certifier/challengers/http01/ftp/internal/lego.go b/pkg/core/certifier/challengers/http01/ftp/internal/lego.go new file mode 100644 index 000000000..c037ffcd7 --- /dev/null +++ b/pkg/core/certifier/challengers/http01/ftp/internal/lego.go @@ -0,0 +1,103 @@ +package internal + +import ( + "context" + "fmt" + "path/filepath" + + "github.com/go-acme/lego/v5/challenge" + "github.com/go-acme/lego/v5/challenge/http01" + + "github.com/certimate-go/certimate/internal/tools/ftp" +) + +var _ challenge.Provider = (*HTTPProvider)(nil) + +type Config struct { + ftp.Config + + WebRootPath string +} + +func NewDefaultConfig() *Config { + defaultCfg := ftp.NewDefaultConfig() + + return &Config{ + Config: *defaultCfg, + WebRootPath: "/", + } +} + +type HTTPProvider struct { + config *Config +} + +func NewHTTPProviderConfig(config *Config) (*HTTPProvider, error) { + if config == nil { + return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") + } + + return &HTTPProvider{ + config: config, + }, nil +} + +func (p *HTTPProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + client, err := p.createFtpClient() + if err != nil { + return fmt.Errorf("ftp: failed to create FTP client: %w", err) + } + + defer client.Quit() + + challengePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token)) + challengeDir := filepath.Dir(challengePath) + challengeFile := filepath.Base(challengePath) + if err := client.MkdirAll(ctx, challengeDir); err != nil { + return fmt.Errorf("ftp: failed to create the \".well-known\" directory: %w", err) + } + if err := client.ChangeDir(ctx, challengeDir); err != nil { + return fmt.Errorf("ftp: failed to change to the \".well-known\" directory: %w", err) + } + if err := client.StoreString(ctx, challengeFile, keyAuth); err != nil { + return fmt.Errorf("ftp: failed to write file for HTTP challenge: %w", err) + } + + return nil +} + +func (p *HTTPProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + client, err := p.createFtpClient() + if err != nil { + return fmt.Errorf("ftp: failed to create FTP client: %w", err) + } + + defer client.Quit() + + challengePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token)) + challengeDir := filepath.Dir(challengePath) + challengeFile := filepath.Base(challengePath) + if err := client.ChangeDir(ctx, challengeDir); err != nil { + return fmt.Errorf("ftp: failed to change to the \".well-known\" directory: %w", err) + } + if err := client.Delete(ctx, challengeFile); err != nil { + return fmt.Errorf("ftp: failed to remove file after HTTP challenge: %w", err) + } + + return nil +} + +func (p *HTTPProvider) createFtpClient() (*ftp.Client, error) { + clientCfg := ftp.NewDefaultConfig() + clientCfg.Host = p.config.Host + clientCfg.Port = p.config.Port + clientCfg.Username = p.config.Username + clientCfg.Password = p.config.Password + + client, err := ftp.NewClient(clientCfg) + if err != nil { + return nil, err + } + + return client, nil +} diff --git a/pkg/core/certifier/challengers/http01/local/local.go b/pkg/core/certifier/challengers/http01/local/local.go index 7b8a0ea7c..861be77de 100644 --- a/pkg/core/certifier/challengers/http01/local/local.go +++ b/pkg/core/certifier/challengers/http01/local/local.go @@ -5,7 +5,7 @@ import ( "github.com/go-acme/lego/v5/providers/http/webroot" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" ) type ChallengerConfig struct { @@ -13,7 +13,7 @@ type ChallengerConfig struct { WebRootPath string `json:"webRootPath"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } diff --git a/pkg/core/certifier/challengers/http01/s3/internal/lego.go b/pkg/core/certifier/challengers/http01/s3/internal/lego.go new file mode 100644 index 000000000..7a7df4044 --- /dev/null +++ b/pkg/core/certifier/challengers/http01/s3/internal/lego.go @@ -0,0 +1,88 @@ +package internal + +import ( + "context" + "fmt" + "strings" + + "github.com/go-acme/lego/v5/challenge" + "github.com/go-acme/lego/v5/challenge/http01" + + "github.com/certimate-go/certimate/internal/tools/s3" +) + +var _ challenge.Provider = (*HTTPProvider)(nil) + +type Config struct { + s3.Config + + Bucket string +} + +func NewDefaultConfig() *Config { + defaultCfg := s3.NewDefaultConfig() + + return &Config{ + Config: *defaultCfg, + } +} + +type HTTPProvider struct { + config *Config +} + +func NewHTTPProviderConfig(config *Config) (*HTTPProvider, error) { + if config == nil { + return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") + } + + return &HTTPProvider{ + config: config, + }, nil +} + +func (p *HTTPProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + client, err := p.createS3Client() + if err != nil { + return fmt.Errorf("s3: failed to create S3 client: %w", err) + } + + objectKey := strings.Trim(http01.ChallengePath(token), "/") + if err := client.PutObjectString(ctx, p.config.Bucket, objectKey, keyAuth); err != nil { + return fmt.Errorf("s3: failed to upload file for HTTP challenge: %w", err) + } + + return nil +} + +func (p *HTTPProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + client, err := p.createS3Client() + if err != nil { + return fmt.Errorf("s3: failed to create S3 client: %w", err) + } + + objectKey := strings.Trim(http01.ChallengePath(token), "/") + if err := client.RemoveObject(ctx, p.config.Bucket, objectKey); err != nil { + return fmt.Errorf("s3: failed to remove file after HTTP challenge: %w", err) + } + + return nil +} + +func (p *HTTPProvider) createS3Client() (*s3.Client, error) { + clientCfg := s3.NewDefaultConfig() + clientCfg.Endpoint = p.config.Endpoint + clientCfg.AccessKey = p.config.AccessKey + clientCfg.SecretKey = p.config.SecretKey + clientCfg.SignatureVersion = p.config.SignatureVersion + clientCfg.UsePathStyle = p.config.UsePathStyle + clientCfg.Region = p.config.Region + clientCfg.SkipTlsVerify = p.config.SkipTlsVerify + + client, err := s3.NewClient(clientCfg) + if err != nil { + return nil, err + } + + return client, nil +} diff --git a/pkg/core/certifier/challengers/http01/s3/s3.go b/pkg/core/certifier/challengers/http01/s3/s3.go index c39263b00..49177822b 100644 --- a/pkg/core/certifier/challengers/http01/s3/s3.go +++ b/pkg/core/certifier/challengers/http01/s3/s3.go @@ -1,14 +1,10 @@ package s3 import ( - "context" "fmt" - "strings" - "github.com/go-acme/lego/v5/challenge/http01" - - "github.com/certimate-go/certimate/internal/tools/s3" - "github.com/certimate-go/certimate/pkg/core/certifier" + "github.com/certimate-go/certimate/pkg/core" + "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/s3/internal" ) type ChallengerConfig struct { @@ -32,57 +28,24 @@ type ChallengerConfig struct { AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } - client, err := createS3Client(*config) - if err != nil { - return nil, fmt.Errorf("s3: failed to create S3 client: %w", err) - } + providerConfig := internal.NewDefaultConfig() + providerConfig.Endpoint = config.Endpoint + providerConfig.AccessKey = config.AccessKey + providerConfig.SecretKey = config.SecretKey + providerConfig.SignatureVersion = config.SignatureVersion + providerConfig.UsePathStyle = config.UsePathStyle + providerConfig.Region = config.Region + providerConfig.SkipTlsVerify = config.AllowInsecureConnections - provider := &provider{client: client, bucket: config.Bucket} - return provider, nil -} - -type provider struct { - client *s3.Client - bucket string -} - -func (p *provider) Present(ctx context.Context, domain, token, keyAuth string) error { - objectKey := strings.Trim(http01.ChallengePath(token), "/") - if err := p.client.PutObjectString(ctx, p.bucket, objectKey, keyAuth); err != nil { - return fmt.Errorf("s3: failed to upload file for HTTP challenge: %w", err) - } - - return nil -} - -func (p *provider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { - objectKey := strings.Trim(http01.ChallengePath(token), "/") - if err := p.client.RemoveObject(ctx, p.bucket, objectKey); err != nil { - return fmt.Errorf("s3: failed to remove file after HTTP challenge: %w", err) - } - - return nil -} - -func createS3Client(config ChallengerConfig) (*s3.Client, error) { - clientCfg := s3.NewDefaultConfig() - clientCfg.Endpoint = config.Endpoint - clientCfg.AccessKey = config.AccessKey - clientCfg.SecretKey = config.SecretKey - clientCfg.SignatureVersion = config.SignatureVersion - clientCfg.UsePathStyle = config.UsePathStyle - clientCfg.Region = config.Region - clientCfg.SkipTlsVerify = config.AllowInsecureConnections - - client, err := s3.NewClient(clientCfg) + provider, err := internal.NewHTTPProviderConfig(providerConfig) if err != nil { return nil, err } - return client, nil + return provider, nil } diff --git a/pkg/core/certifier/challengers/http01/ssh/internal/ssh.go b/pkg/core/certifier/challengers/http01/ssh/internal/ssh.go new file mode 100644 index 000000000..998646ec9 --- /dev/null +++ b/pkg/core/certifier/challengers/http01/ssh/internal/ssh.go @@ -0,0 +1,108 @@ +package internal + +import ( + "context" + "fmt" + "path/filepath" + + "github.com/go-acme/lego/v5/challenge" + "github.com/go-acme/lego/v5/challenge/http01" + + "github.com/certimate-go/certimate/internal/tools/ssh" + xssh "github.com/certimate-go/certimate/pkg/utils/ssh" +) + +var _ challenge.Provider = (*HTTPProvider)(nil) + +type Config struct { + ssh.Config + + UseSCP bool + WebRootPath string +} + +func NewDefaultConfig() *Config { + defaultCfg := ssh.NewDefaultConfig() + + return &Config{ + Config: *defaultCfg, + UseSCP: false, + WebRootPath: "/var/www/html", + } +} + +type HTTPProvider struct { + config *Config +} + +func NewHTTPProviderConfig(config *Config) (*HTTPProvider, error) { + if config == nil { + return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") + } + + return &HTTPProvider{ + config: config, + }, nil +} + +func (p *HTTPProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + client, err := p.createSshClient() + if err != nil { + return fmt.Errorf("ssh: failed to create SSH client: %w", err) + } + + defer client.Close() + + challengePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token)) + if err := xssh.WriteRemoteString(client.RawClient(), challengePath, keyAuth, p.config.UseSCP); err != nil { + return fmt.Errorf("ssh: failed to write file for HTTP challenge: %w", err) + } + + return nil +} + +func (p *HTTPProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + client, err := p.createSshClient() + if err != nil { + return fmt.Errorf("ssh: failed to create SSH client: %w", err) + } + + defer client.Close() + + // 删除质询文件 + challengePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token)) + if err := xssh.RemoveRemote(client.RawClient(), challengePath, p.config.UseSCP); err != nil { + return fmt.Errorf("ssh: failed to remove file after HTTP challenge: %w", err) + } + + return nil +} + +func (p *HTTPProvider) createSshClient() (*ssh.Client, error) { + clientCfg := ssh.NewDefaultConfig() + clientCfg.Host = p.config.Host + clientCfg.Port = p.config.Port + clientCfg.AuthMethod = ssh.AuthMethodType(p.config.AuthMethod) + clientCfg.Username = p.config.Username + clientCfg.Password = p.config.Password + clientCfg.Key = p.config.Key + clientCfg.KeyPassphrase = p.config.KeyPassphrase + for _, jumpServer := range p.config.JumpServers { + jumpServerCfg := ssh.NewServerConfig() + jumpServerCfg.Host = jumpServer.Host + jumpServerCfg.Port = jumpServer.Port + jumpServerCfg.AuthMethod = ssh.AuthMethodType(jumpServer.AuthMethod) + jumpServerCfg.Username = jumpServer.Username + jumpServerCfg.Password = jumpServer.Password + jumpServerCfg.Key = jumpServer.Key + jumpServerCfg.KeyPassphrase = jumpServer.KeyPassphrase + clientCfg.JumpServers = append(clientCfg.JumpServers, *jumpServerCfg) + } + + client, err := ssh.NewClient(clientCfg) + if err != nil { + return nil, err + } + + return client, nil +} diff --git a/pkg/core/certifier/challengers/http01/ssh/ssh.go b/pkg/core/certifier/challengers/http01/ssh/ssh.go index 355253c15..a7b0738ed 100644 --- a/pkg/core/certifier/challengers/http01/ssh/ssh.go +++ b/pkg/core/certifier/challengers/http01/ssh/ssh.go @@ -1,15 +1,11 @@ package ssh import ( - "context" "fmt" - "path/filepath" - - "github.com/go-acme/lego/v5/challenge/http01" "github.com/certimate-go/certimate/internal/tools/ssh" - "github.com/certimate-go/certimate/pkg/core/certifier" - xssh "github.com/certimate-go/certimate/pkg/utils/ssh" + "github.com/certimate-go/certimate/pkg/core" + "github.com/certimate-go/certimate/pkg/core/certifier/challengers/http01/ssh/internal" ) type ServerConfig struct { @@ -44,77 +40,36 @@ type ChallengerConfig struct { WebRootPath string `json:"webRootPath"` } -func NewChallenger(config *ChallengerConfig) (certifier.ACMEChallenger, error) { +func NewChallenger(config *ChallengerConfig) (core.ACMEChallenger, error) { if config == nil { return nil, fmt.Errorf("the configuration of the acme challenge provider is nil") } - provider := &provider{config: config} - return provider, nil -} - -type provider struct { - config *ChallengerConfig -} - -func (p *provider) Present(ctx context.Context, domain, token, keyAuth string) error { - client, err := createSshClient(*p.config) - if err != nil { - return fmt.Errorf("ssh: failed to create SSH client: %w", err) - } - - defer client.Close() - - challengePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token)) - if err := xssh.WriteRemoteString(client.RawClient(), challengePath, keyAuth, p.config.UseSCP); err != nil { - return fmt.Errorf("ssh: failed to write file for HTTP challenge: %w", err) - } - - return nil -} - -func (p *provider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { - client, err := createSshClient(*p.config) - if err != nil { - return fmt.Errorf("ssh: failed to create SSH client: %w", err) - } - - defer client.Close() - - // 删除质询文件 - challengePath := filepath.Join(p.config.WebRootPath, http01.ChallengePath(token)) - if err := xssh.RemoveRemote(client.RawClient(), challengePath, p.config.UseSCP); err != nil { - return fmt.Errorf("ssh: failed to remove file after HTTP challenge: %w", err) - } - - return nil -} - -func createSshClient(config ChallengerConfig) (*ssh.Client, error) { - clientCfg := ssh.NewDefaultConfig() - clientCfg.Host = config.SshHost - clientCfg.Port = int(config.SshPort) - clientCfg.AuthMethod = ssh.AuthMethodType(config.SshAuthMethod) - clientCfg.Username = config.SshUsername - clientCfg.Password = config.SshPassword - clientCfg.Key = config.SshKey - clientCfg.KeyPassphrase = config.SshKeyPassphrase + providerConfig := internal.NewDefaultConfig() + providerConfig.Host = config.SshHost + providerConfig.Port = int(config.SshPort) + providerConfig.AuthMethod = ssh.AuthMethodType(config.SshAuthMethod) + providerConfig.Username = config.SshUsername + providerConfig.Password = config.SshPassword + providerConfig.Key = config.SshKey + providerConfig.KeyPassphrase = config.SshKeyPassphrase for _, jumpServer := range config.JumpServers { - jumpServerCfg := ssh.NewServerConfig() - jumpServerCfg.Host = jumpServer.SshHost - jumpServerCfg.Port = int(jumpServer.SshPort) - jumpServerCfg.AuthMethod = ssh.AuthMethodType(jumpServer.SshAuthMethod) - jumpServerCfg.Username = jumpServer.SshUsername - jumpServerCfg.Password = jumpServer.SshPassword - jumpServerCfg.Key = jumpServer.SshKey - jumpServerCfg.KeyPassphrase = jumpServer.SshKeyPassphrase - clientCfg.JumpServers = append(clientCfg.JumpServers, *jumpServerCfg) + jumpServerCfg := ssh.ServerConfig{ + Host: jumpServer.SshHost, + Port: int(jumpServer.SshPort), + AuthMethod: ssh.AuthMethodType(jumpServer.SshAuthMethod), + Username: jumpServer.SshUsername, + Password: jumpServer.SshPassword, + Key: jumpServer.SshKey, + KeyPassphrase: jumpServer.SshKeyPassphrase, + } + providerConfig.JumpServers = append(providerConfig.JumpServers, jumpServerCfg) } - client, err := ssh.NewClient(clientCfg) + provider, err := internal.NewHTTPProviderConfig(providerConfig) if err != nil { return nil, err } - return client, nil + return provider, nil } diff --git a/pkg/core/certifier/challenger.go b/pkg/core/certifier/typealias.go similarity index 100% rename from pkg/core/certifier/challenger.go rename to pkg/core/certifier/typealias.go diff --git a/pkg/core/certmgr/errors.go b/pkg/core/certmgr/errors.go deleted file mode 100644 index 62473c62a..000000000 --- a/pkg/core/certmgr/errors.go +++ /dev/null @@ -1,10 +0,0 @@ -package certmgr - -import ( - "github.com/certimate-go/certimate/pkg/core" -) - -var ( - ErrNotImplemented = core.ErrNotImplemented - ErrUnsupported = core.ErrUnsupported -) diff --git a/pkg/core/certmgr/provider.go b/pkg/core/certmgr/provider.go deleted file mode 100644 index 8d720d9a4..000000000 --- a/pkg/core/certmgr/provider.go +++ /dev/null @@ -1,11 +0,0 @@ -package certmgr - -import ( - "github.com/certimate-go/certimate/pkg/core" -) - -type Provider = core.Certmgr - -type ReplaceResult = core.CertmgrReplaceResult - -type UploadResult = core.CertmgrUploadResult diff --git a/pkg/core/certmgr/providers/1panel/1panel.go b/pkg/core/certmgr/providers/1panel/1panel.go index 329acee29..5088e908c 100644 --- a/pkg/core/certmgr/providers/1panel/1panel.go +++ b/pkg/core/certmgr/providers/1panel/1panel.go @@ -9,11 +9,17 @@ import ( "strings" "time" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" onepanelsdk "github.com/certimate-go/certimate/pkg/sdk3rd/1panel" onepanelsdk2 "github.com/certimate-go/certimate/pkg/sdk3rd/1panel/v2" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 1Panel 服务地址。 ServerUrl string `json:"serverUrl"` @@ -34,7 +40,7 @@ type Certmgr struct { sdkClient any } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -61,7 +67,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 避免重复上传 if upres, upok, err := c.tryGetResultIfCertExists(ctx, certPEM, privkeyPEM); err != nil { return nil, err @@ -119,7 +125,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert } } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { sslId, err := strconv.ParseInt(certIdOrName, 10, 64) if err != nil { return nil, err @@ -178,10 +184,10 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri panic("unreachable") } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } -func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, bool, error) { +func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, bool, error) { switch sdkClient := c.sdkClient.(type) { case *onepanelsdk.Client: { @@ -215,7 +221,7 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkey newPrivkeyPEM := strings.TrimSpace(strings.ReplaceAll(strings.ReplaceAll(privkeyPEM, "\r", ""), "\n", "")) if oldCertPEM == newCertPEM && oldPrivkeyPEM == newPrivkeyPEM { // 如果已存在相同证书，直接返回 - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", sslItem.ID), CertName: sslItem.Description, }, true, nil @@ -264,7 +270,7 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkey newPrivkeyPEM := strings.TrimSpace(strings.ReplaceAll(strings.ReplaceAll(privkeyPEM, "\r", ""), "\n", "")) if oldCertPEM == newCertPEM && oldPrivkeyPEM == newPrivkeyPEM { // 如果已存在相同证书，直接返回 - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", sslItem.ID), CertName: sslItem.Description, }, true, nil diff --git a/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go b/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go index 020b3703d..c25bccda1 100644 --- a/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go +++ b/pkg/core/certmgr/providers/aliyun-cas/aliyun_cas.go @@ -12,11 +12,18 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" alicas "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client" + + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -34,7 +41,7 @@ type Certmgr struct { sdkClient *alicas.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -61,7 +68,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -126,7 +133,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", tea.Int64Value(certItem.CertificateId)), CertName: tea.StringValue(certItem.Name), ExtendedData: map[string]any{ @@ -172,7 +179,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'cas.GetUserCertificateDetail': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", tea.Int64Value(getUserCertificateDetailResp.Body.Id)), CertName: certName, ExtendedData: map[string]any{ @@ -182,8 +189,8 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, accessKeySecret, region string) (*alicas.Client, error) { diff --git a/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go b/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go index 967f98461..8f44c4c3c 100644 --- a/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go +++ b/pkg/core/certmgr/providers/aliyun-slb/aliyun_slb.go @@ -16,11 +16,18 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" alislb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client" + + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -38,7 +45,7 @@ type Certmgr struct { sdkClient *alislb.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -65,7 +72,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -107,7 +114,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: tea.StringValue(certItem.ServerCertificateId), CertName: tea.StringValue(certItem.ServerCertificateName), }, nil @@ -138,14 +145,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'slb.UploadServerCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: *uploadServerCertificateResp.Body.ServerCertificateId, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, accessKeySecret, region string) (*alislb.Client, error) { diff --git a/pkg/core/certmgr/providers/aws-acm/aws_acm.go b/pkg/core/certmgr/providers/aws-acm/aws_acm.go index afa80f94b..5fd3e2237 100644 --- a/pkg/core/certmgr/providers/aws-acm/aws_acm.go +++ b/pkg/core/certmgr/providers/aws-acm/aws_acm.go @@ -11,10 +11,16 @@ import ( awscred "github.com/aws/aws-sdk-go-v2/credentials" awsacm "github.com/aws/aws-sdk-go-v2/service/acm" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // AWS AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -30,7 +36,7 @@ type Certmgr struct { sdkClient *awsacm.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -57,7 +63,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -120,7 +126,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: *certItem.CertificateArn, }, nil } @@ -145,12 +151,12 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'acm.ImportCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: aws.ToString(importCertificateResp.CertificateArn), }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -171,7 +177,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'acm.ImportCertificate': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey, region string) (*awsacm.Client, error) { diff --git a/pkg/core/certmgr/providers/aws-iam/aws_iam.go b/pkg/core/certmgr/providers/aws-iam/aws_iam.go index 1dd6be99c..af69cbe11 100644 --- a/pkg/core/certmgr/providers/aws-iam/aws_iam.go +++ b/pkg/core/certmgr/providers/aws-iam/aws_iam.go @@ -11,10 +11,16 @@ import ( awscred "github.com/aws/aws-sdk-go-v2/credentials" awsiam "github.com/aws/aws-sdk-go-v2/service/iam" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // AWS AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -33,7 +39,7 @@ type Certmgr struct { sdkClient *awsiam.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -60,7 +66,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -123,7 +129,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: aws.ToString(certItem.ServerCertificateId), CertName: aws.ToString(certItem.ServerCertificateName), }, nil @@ -157,14 +163,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'iam.UploadServerCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: aws.ToString(uploadServerCertificateResp.ServerCertificateMetadata.ServerCertificateId), CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey, region string) (*awsiam.Client, error) { diff --git a/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go b/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go index 3f5fae2a7..08f7585a1 100644 --- a/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go +++ b/pkg/core/certmgr/providers/azure-keyvault/azure_keyvault.go @@ -13,11 +13,17 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azcertificates" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" azenv "github.com/certimate-go/certimate/pkg/sdk3rd/azure/env" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // Azure TenantId。 TenantId string `json:"tenantId"` @@ -37,7 +43,7 @@ type Certmgr struct { sdkClient *azcertificates.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -64,7 +70,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -123,7 +129,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: string(*certItem.ID), CertName: certItem.ID.Name(), }, nil @@ -161,13 +167,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'keyvault.ImportCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: string(*importCertificateResp.ID), CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -192,7 +198,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri } else { // 如果已存在相同证书，直接返回 if xcert.EqualCertificatesFromPEM(certPEM, string(getCertificateResp.CER)) { - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } } @@ -216,7 +222,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'keyvault.ImportCertificate': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } const ( diff --git a/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go b/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go index cc81689cb..c2764f111 100644 --- a/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go +++ b/pkg/core/certmgr/providers/baiducloud-cert/baiducloud_cert.go @@ -7,11 +7,17 @@ import ( "strings" "time" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" baiducert "github.com/certimate-go/certimate/pkg/sdk3rd/baiducloud/cert" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 百度智能云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -25,7 +31,7 @@ type Certmgr struct { sdkClient *baiducert.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -52,7 +58,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -97,7 +103,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.CertId, CertName: certItem.CertName, }, nil @@ -116,14 +122,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'cert.CreateCert': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: createCertResp.CertId, CertName: createCertResp.CertName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey string) (*baiducert.Client, error) { diff --git a/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go b/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go index 49a1dac90..5e5bc024d 100644 --- a/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go +++ b/pkg/core/certmgr/providers/baishan-cdn/baishan_cdn.go @@ -10,10 +10,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" baishansdk "github.com/certimate-go/certimate/pkg/sdk3rd/baishan" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 白山云 API Token。 ApiToken string `json:"apiToken"` @@ -25,7 +31,7 @@ type Certmgr struct { sdkClient *baishansdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -52,7 +58,7 @@ func (d *Certmgr) SetLogger(logger *slog.Logger) { } } -func (d *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (d *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 生成新证书名（需符合白山云命名规则） certName := fmt.Sprintf("certimate_%d", time.Now().UnixMilli()) @@ -82,13 +88,13 @@ func (d *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert certId = uploadDomainCertificateResp.Data.CertId.String() } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certId, CertName: certName, }, nil } -func (d *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (d *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { // 替换证书 // REF: https://portal.baishancloud.com/track/document/downloadPdf/1441 uploadDomainCertificateReq := &baishansdk.UploadDomainCertificateRequest{ @@ -103,7 +109,7 @@ func (d *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'cdn.UploadDomainCertificate': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } func createSDKClient(apiToken string) (*baishansdk.Client, error) { diff --git a/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn.go b/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn.go index 8f5b93b1c..0e11dc7b2 100644 --- a/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn.go +++ b/pkg/core/certmgr/providers/byteplus-cdn/byteplus_cdn.go @@ -12,10 +12,16 @@ import ( bpcdn "github.com/byteplus-sdk/byteplus-sdk-golang/service/cdn" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // BytePlus AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -29,7 +35,7 @@ type Certmgr struct { sdkClient *bpcdn.CDN } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -55,7 +61,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -99,7 +105,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.CertId, CertName: certItem.Desc, }, nil @@ -129,12 +135,12 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'cdn.AddCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: addCertificateResp.Result.CertId, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } diff --git a/pkg/core/certmgr/providers/byteplus-certcenter/byteplus_certcenter.go b/pkg/core/certmgr/providers/byteplus-certcenter/byteplus_certcenter.go index 8e8033603..a65e5988f 100644 --- a/pkg/core/certmgr/providers/byteplus-certcenter/byteplus_certcenter.go +++ b/pkg/core/certmgr/providers/byteplus-certcenter/byteplus_certcenter.go @@ -9,8 +9,15 @@ import ( bpsesion "github.com/byteplus-sdk/byteplus-go-sdk-v2/byteplus/session" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" bpcertificateservice "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/byteplus-sdk/byteplus-go-sdk-v2/service/certificateservice" + + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult ) type CertmgrConfig struct { @@ -30,7 +37,7 @@ type Certmgr struct { sdkClient *bpcertificateservice.CERTIFICATESERVICE } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -57,7 +64,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 上传证书 // REF: https://docs.byteplus.com/en/docs/byteplus-certificate-center/reference-uploadcertificate uploadCertificateReq := &bpcertificateservice.UploadCertificateInput{ @@ -86,13 +93,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("received empty certificate id, both `InstanceId` and `RepeatId` are empty") } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: sslId, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey, region string) (*bpcertificateservice.CERTIFICATESERVICE, error) { diff --git a/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive.go b/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive.go index e851ce94c..ccde54dc9 100644 --- a/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive.go +++ b/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive.go @@ -11,10 +11,16 @@ import ( bplive "github.com/byteplus-sdk/byteplus-sdk-golang/service/live/v20230101" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // BytePlus AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -30,7 +36,7 @@ type Certmgr struct { sdkClient *bplive.Live } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -56,7 +62,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 查询证书列表，避免重复上传 // REF: https://docs.byteplus.com/en/docs/byteplus-media-live/docs-listcertv2 listCertPageNum := 1 @@ -94,7 +100,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert oldCertPEM := strings.Join(describeCertDetailSecretResp.Result.SSL.Chain, "\n\n") if xcert.EqualCertificatesFromPEM(certPEM, oldCertPEM) { c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.ChainID, CertName: certItem.CertName, }, nil @@ -128,13 +134,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'medialive.CreateCert': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: *createCertResp.Result.ChainID, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { // 更新证书 // REF: https://docs.byteplus.com/en/docs/byteplus-media-live/docs-createcert-2023 createCertReq := &bplive.CreateCertBody{ @@ -152,5 +158,5 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'medialive.CreateCert': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } diff --git a/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive_test.go b/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive_test.go index f8c9dee90..db01e4600 100644 --- a/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive_test.go +++ b/pkg/core/certmgr/providers/byteplus-medialive/byteplus_medialive_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/certimate-go/certimate/pkg/core/certmgr/internal/tester" - impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-live" + impl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-medialive" ) var ( diff --git a/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao.go b/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao.go index f22ac847c..237c6a835 100644 --- a/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao.go +++ b/pkg/core/certmgr/providers/ctcccloud-ao/ctcccloud_ao.go @@ -10,11 +10,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ctyunao "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/ao" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -28,7 +34,7 @@ type Certmgr struct { sdkClient *ctyunao.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -55,7 +61,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -123,7 +129,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", queryCertResp.ReturnObj.Result.Id), CertName: queryCertResp.ReturnObj.Result.Name, }, nil @@ -152,14 +158,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'ao.CreateCert': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", createCertResp.ReturnObj.Id), CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey string) (*ctyunao.Client, error) { diff --git a/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn.go b/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn.go index 721bc4bef..c9449691f 100644 --- a/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn.go +++ b/pkg/core/certmgr/providers/ctcccloud-cdn/ctcccloud_cdn.go @@ -10,11 +10,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ctyuncdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/cdn" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -28,7 +34,7 @@ type Certmgr struct { sdkClient *ctyuncdn.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -55,7 +61,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -123,7 +129,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", queryCertDetailResp.ReturnObj.Result.Id), CertName: queryCertDetailResp.ReturnObj.Result.Name, }, nil @@ -152,14 +158,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'cdn.CreateCert': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", createCertResp.ReturnObj.Id), CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey string) (*ctyuncdn.Client, error) { diff --git a/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go b/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go index 422ea2800..30b1cd142 100644 --- a/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go +++ b/pkg/core/certmgr/providers/ctcccloud-cms/ctcccloud_cms.go @@ -11,11 +11,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ctyuncms "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/cms" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -29,7 +35,7 @@ type Certmgr struct { sdkClient *ctyuncms.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -56,7 +62,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 避免重复上传 if upres, upok, err := c.tryGetResultIfCertExists(ctx, certPEM); err != nil { return nil, err @@ -110,11 +116,11 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert } } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } -func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) (*certmgr.UploadResult, bool, error) { +func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) (*UploadResult, bool, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -172,7 +178,7 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.Id, CertName: certItem.Name, }, true, nil diff --git a/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb.go b/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb.go index e2660dda4..21a033527 100644 --- a/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb.go +++ b/pkg/core/certmgr/providers/ctcccloud-elb/ctcccloud_elb.go @@ -9,11 +9,17 @@ import ( "github.com/pocketbase/pocketbase/tools/security" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ctyunelb "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/elb" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -29,7 +35,7 @@ type Certmgr struct { sdkClient *ctyunelb.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -56,7 +62,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 查询证书列表，避免重复上传 // REF: https://eop.ctyun.cn/ebp/ctapiDocument/search?sid=24&api=5692&data=88&isNormal=1&vid=82 listCertificatesReq := &ctyunelb.ListCertificatesRequest{ @@ -71,7 +77,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果已存在相同证书，直接返回 if xcert.EqualCertificatesFromPEM(certPEM, certItem.Certificate) { c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.ID, CertName: certItem.Name, }, nil @@ -99,14 +105,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'elb.CreateCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: createCertificateResp.ReturnObj.ID, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey string) (*ctyunelb.Client, error) { diff --git a/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn.go b/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn.go index df44c259d..a6f816f25 100644 --- a/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn.go +++ b/pkg/core/certmgr/providers/ctcccloud-icdn/ctcccloud_icdn.go @@ -10,11 +10,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ctyunicdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/icdn" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -28,7 +34,7 @@ type Certmgr struct { sdkClient *ctyunicdn.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -55,7 +61,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -123,7 +129,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", queryCertDetailResp.ReturnObj.Result.Id), CertName: queryCertDetailResp.ReturnObj.Result.Name, }, nil @@ -152,14 +158,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'icdn.CreateCert': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", createCertResp.ReturnObj.Id), CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey string) (*ctyunicdn.Client, error) { diff --git a/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn.go b/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn.go index 1b5089ec4..5e1d0d3eb 100644 --- a/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn.go +++ b/pkg/core/certmgr/providers/ctcccloud-lvdn/ctcccloud_lvdn.go @@ -10,11 +10,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ctyunlvdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/lvdn" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -28,7 +34,7 @@ type Certmgr struct { sdkClient *ctyunlvdn.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -55,7 +61,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -123,7 +129,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", queryCertDetailResp.ReturnObj.Result.Id), CertName: queryCertDetailResp.ReturnObj.Result.Name, }, nil @@ -152,14 +158,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'lvdn.CreateCert': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", createCertResp.ReturnObj.Id), CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey string) (*ctyunlvdn.Client, error) { diff --git a/pkg/core/certmgr/providers/dogecloud/dogecloud.go b/pkg/core/certmgr/providers/dogecloud/dogecloud.go index 93d738c26..69a0db421 100644 --- a/pkg/core/certmgr/providers/dogecloud/dogecloud.go +++ b/pkg/core/certmgr/providers/dogecloud/dogecloud.go @@ -6,10 +6,16 @@ import ( "log/slog" "time" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" dogesdk "github.com/certimate-go/certimate/pkg/sdk3rd/dogecloud" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 多吉云 AccessKey。 AccessKey string `json:"accessKey"` @@ -23,7 +29,7 @@ type Certmgr struct { sdkClient *dogesdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -50,7 +56,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 生成新证书名（需符合多吉云命名规则） certName := fmt.Sprintf("certimate-%d", time.Now().UnixMilli()) @@ -67,14 +73,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'cdn.UploadCdnCert': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", uploadSslCertResp.Data.Id), CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKey, secretKey string) (*dogesdk.Client, error) { diff --git a/pkg/core/certmgr/providers/dokploy/dokploy.go b/pkg/core/certmgr/providers/dokploy/dokploy.go index d561ff249..6de9f75bf 100644 --- a/pkg/core/certmgr/providers/dokploy/dokploy.go +++ b/pkg/core/certmgr/providers/dokploy/dokploy.go @@ -9,10 +9,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" dokploysdk "github.com/certimate-go/certimate/pkg/sdk3rd/dokploy" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // Dokploy 服务地址。 ServerUrl string `json:"serverUrl"` @@ -28,7 +34,7 @@ type Certmgr struct { sdkClient *dokploysdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -55,7 +61,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 查询证书列表，避免重复上传 // REF: https://docs.dokploy.com/docs/api/certificates#certificates-all certificatesAllReq := &dokploysdk.CertificatesAllRequest{} @@ -68,7 +74,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert if certItem.CertificateData == certPEM && certItem.PrivateKey == privkeyPEM { // 如果已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.CertificateId, CertName: certItem.Name, }, nil @@ -99,14 +105,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'certificates.create': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certificatesCreateResp.CertificateId, CertName: certificatesCreateResp.Name, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(serverUrl, apiKey string, skipTlsVerify bool) (*dokploysdk.Client, error) { diff --git a/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn.go b/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn.go index 31dbc8328..e068d3bc5 100644 --- a/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn.go +++ b/pkg/core/certmgr/providers/gcore-cdn/gcore_cdn.go @@ -9,10 +9,16 @@ import ( gcore "github.com/G-Core/gcorelabscdn-go/gcore/provider" "github.com/G-Core/gcorelabscdn-go/sslcerts" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" gcoresdk "github.com/certimate-go/certimate/pkg/sdk3rd/gcore" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // G-Core API Token。 ApiToken string `json:"apiToken"` @@ -24,7 +30,7 @@ type Certmgr struct { sdkClient *sslcerts.Service } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -51,7 +57,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 新增证书 // REF: https://api.gcore.com/docs/cdn#tag/SSL-certificates/operation/add_ssl_certificates createCertificateReq := &sslcerts.CreateRequest{ @@ -67,14 +73,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'sslcerts.Create': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", createCertificateResp.ID), CertName: createCertificateResp.Name, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(apiToken string) (*sslcerts.Service, error) { diff --git a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go index 9b48e6c9f..f2dce504f 100644 --- a/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/pkg/core/certmgr/providers/huaweicloud-elb/huaweicloud_elb.go @@ -15,11 +15,18 @@ import ( hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" hwelb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" + + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 华为云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -37,7 +44,7 @@ type Certmgr struct { sdkClient *hwelb.ElbClient } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -64,7 +71,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 查询已有证书，避免重复上传 // REF: https://support.huaweicloud.com/api-elb/ListCertificates.html listCertificatesMarker := (*string)(nil) @@ -94,7 +101,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果已存在相同证书，直接返回 if xcert.EqualCertificatesFromPEM(certPEM, certItem.Certificate) { c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.Id, CertName: certItem.Name, }, nil @@ -137,13 +144,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'elb.CreateCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: createCertificateResp.Certificate.Id, CertName: createCertificateResp.Certificate.Name, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { // 更新证书 // REF: https://support.huaweicloud.com/api-elb/UpdateCertificate.html updateCertificateReq := &hwelbmodel.UpdateCertificateRequest{ @@ -161,7 +168,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'elb.UpdateCertificate': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwelb.ElbClient, error) { diff --git a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go index aa8cd7b67..6b901b621 100644 --- a/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/pkg/core/certmgr/providers/huaweicloud-scm/huaweicloud_scm.go @@ -12,11 +12,18 @@ import ( hwscmregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/region" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" hwscm "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3" + + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 华为云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -34,7 +41,7 @@ type Certmgr struct { sdkClient *hwscm.ScmClient } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -61,7 +68,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -127,7 +134,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.Id, CertName: certItem.Name, }, nil @@ -159,14 +166,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'scm.ImportCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: *importCertificateResp.CertificateId, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwscm.ScmClient, error) { diff --git a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go index 777bd808f..daf2fc619 100644 --- a/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/pkg/core/certmgr/providers/huaweicloud-waf/huaweicloud_waf.go @@ -15,11 +15,18 @@ import ( hwwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" hwwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" + + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 华为云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -37,7 +44,7 @@ type Certmgr struct { sdkClient *hwwaf.WafClient } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -64,7 +71,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 查询已有证书，避免重复上传 // REF: https://support.huaweicloud.com/api-waf/ListCertificates.html // REF: https://support.huaweicloud.com/api-waf/ShowCertificate.html @@ -106,7 +113,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果已存在相同证书，直接返回 if xcert.EqualCertificatesFromPEM(certPEM, lo.FromPtr(showCertificateResp.Content)) { c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.Id, CertName: certItem.Name, }, nil @@ -139,14 +146,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'waf.CreateCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: *createCertificateResp.Id, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey, region string) (*hwwaf.WafClient, error) { diff --git a/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go b/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go index 53a2b1318..d83089e23 100644 --- a/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go +++ b/pkg/core/certmgr/providers/jdcloud-ssl/jdcloud_ssl.go @@ -12,11 +12,18 @@ import ( jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" jdsslapis "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/apis" - "github.com/certimate-go/certimate/pkg/core/certmgr" jdssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client" + + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 京东云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -30,7 +37,7 @@ type Certmgr struct { sdkClient *jdssl.SslClient } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -57,7 +64,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -118,7 +125,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.CertId, CertName: certItem.CertName, }, nil @@ -146,14 +153,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'ssl.UploadCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: uploadCertResp.Result.CertId, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, accessKeySecret string) (*jdssl.SslClient, error) { diff --git a/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager.go b/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager.go index 64798d0e3..e378fa636 100644 --- a/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager.go +++ b/pkg/core/certmgr/providers/nginxproxymanager/nginxproxymanager.go @@ -8,11 +8,17 @@ import ( "strconv" "time" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" npmsdk "github.com/certimate-go/certimate/pkg/sdk3rd/nginxproxymanager" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // NPM 服务地址。 ServerUrl string `json:"serverUrl"` @@ -36,7 +42,7 @@ type Certmgr struct { sdkClient *npmsdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -63,7 +69,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -83,7 +89,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert certItem.Meta.IntermediateCertificate == intermediaCertPEM { // 如果已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", certItem.Id), CertName: certItem.NiceName, }, nil @@ -116,13 +122,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'nginx.UploadCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", nginxCreateCertificateResp.Id), CertName: nginxCreateCertificateResp.NiceName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { certId, err := strconv.ParseInt(certIdOrName, 10, 64) if err != nil { return nil, err @@ -148,7 +154,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'nginx.UploadCertificate': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } func createSDKClient(serverUrl, authMethod, username, password, apiToken string, skipTlsVerify bool) (*npmsdk.Client, error) { diff --git a/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert.go b/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert.go index c3e36ed86..f14dc2b79 100644 --- a/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert.go +++ b/pkg/core/certmgr/providers/qiniu-sslcert/qiniu_sslcert.go @@ -11,11 +11,17 @@ import ( "github.com/qiniu/go-sdk/v7/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" qiniusdk "github.com/certimate-go/certimate/pkg/sdk3rd/qiniu" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 七牛云 AccessKey。 AccessKey string `json:"accessKey"` @@ -29,7 +35,7 @@ type Certmgr struct { sdkClient *qiniusdk.SslCertManager } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -56,7 +62,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -118,7 +124,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: sslItem.CertID, CertName: sslItem.Name, }, nil @@ -139,14 +145,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'sslcert.Upload': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: uploadSslCertResp.CertID, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKey, secretKey string) (*qiniusdk.SslCertManager, error) { diff --git a/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go b/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go index 401789317..8d95bb833 100644 --- a/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go +++ b/pkg/core/certmgr/providers/rainyun-sslcenter/rainyun_sslcenter.go @@ -9,11 +9,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" rainyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/rainyun" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 雨云 API 密钥。 ApiKey string `json:"ApiKey"` @@ -25,7 +31,7 @@ type Certmgr struct { sdkClient *rainyunsdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -52,7 +58,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 避免重复上传 if upres, upok, err := c.tryGetResultIfCertExists(ctx, certPEM); err != nil { return nil, err @@ -83,7 +89,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert } } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { certId, err := strconv.ParseInt(certIdOrName, 10, 64) if err != nil { return nil, err @@ -101,10 +107,10 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'sslcenter.Update': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } -func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) (*certmgr.UploadResult, bool, error) { +func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) (*UploadResult, bool, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -162,7 +168,7 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) } // 如果以上信息都一致，则视为已存在相同证书，直接返回 - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", sslItem.ID), }, true, nil } diff --git a/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go b/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go index d7134671c..c2b1976c0 100644 --- a/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/pkg/core/certmgr/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -9,8 +9,15 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" tcssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" + + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult ) type CertmgrConfig struct { @@ -30,7 +37,7 @@ type Certmgr struct { sdkClient *tcssl.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -57,7 +64,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 上传新证书 // REF: https://cloud.tencent.com/document/api/400/41665 uploadCertificateReq := tcssl.NewUploadCertificateRequest() @@ -71,13 +78,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'ssl.UploadCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: *uploadCertificateResp.Response.CertificateId, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(secretId, secretKey, endpoint string) (*tcssl.Client, error) { diff --git a/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go b/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go index ad6766c4a..6015ce294 100644 --- a/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go +++ b/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go @@ -10,11 +10,17 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ulb" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -32,7 +38,7 @@ type Certmgr struct { sdkClient *ucloudsdk.ULBClient } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -59,7 +65,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 避免重复上传 if upres, upok, err := c.tryGetResultIfCertExists(ctx, certPEM, privkeyPEM); err != nil { return nil, err @@ -88,17 +94,17 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert createSSLResp, err := c.sdkClient.CreateSSL(createSSLReq) c.logger.Debug("sdk request 'ulb.CreateSSL'", slog.Any("request", createSSLReq), slog.Any("response", createSSLResp)) - return &certmgr.UploadResult{ + return &UploadResult{ CertId: createSSLResp.SSLId, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } -func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, bool, error) { +func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, bool, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -155,7 +161,7 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkey } // 如果以上信息都一致，则视为已存在相同证书，直接返回 - return &certmgr.UploadResult{ + return &UploadResult{ CertId: sslItem.SSLId, CertName: sslItem.SSLName, }, true, nil diff --git a/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go b/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go index a53fb76ba..3e309bafd 100644 --- a/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go +++ b/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go @@ -11,11 +11,17 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/upathx" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -31,7 +37,7 @@ type Certmgr struct { sdkClient *ucloudsdk.UPathXClient } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -58,7 +64,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 避免重复上传 if upres, upok, err := c.tryGetResultIfCertExists(ctx, certPEM, privkeyPEM); err != nil { return nil, err @@ -87,17 +93,17 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert createPathXSSLResp, err := c.sdkClient.CreatePathXSSL(createPathXSSLReq) c.logger.Debug("sdk request 'pathx.CreatePathXSSL'", slog.Any("request", createPathXSSLReq), slog.Any("response", createPathXSSLResp)) - return &certmgr.UploadResult{ + return &UploadResult{ CertId: createPathXSSLResp.SSLId, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } -func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, bool, error) { +func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, bool, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -154,7 +160,7 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM, privkey } // 如果以上信息都一致，则视为已存在相同证书，直接返回 - return &certmgr.UploadResult{ + return &UploadResult{ CertId: sslItem.SSLId, CertName: sslItem.SSLName, }, true, nil diff --git a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go index 7d209db71..2e3cef821 100644 --- a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go +++ b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go @@ -14,11 +14,17 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ussl" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -34,7 +40,7 @@ type Certmgr struct { sdkClient *ucloudsdk.USSLClient } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -61,7 +67,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 生成新证书名（需符合优刻得命名规则） certName := fmt.Sprintf("certimate-%d", time.Now().UnixMilli()) @@ -95,7 +101,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'ussl.UploadNormalCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", uploadNormalCertificateResp.CertificateID), CertName: certName, ExtendedData: map[string]any{ @@ -104,11 +110,11 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } -func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) (*certmgr.UploadResult, bool, error) { +func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) (*UploadResult, bool, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -204,7 +210,7 @@ func (c *Certmgr) tryGetResultIfCertExists(ctx context.Context, certPEM string) continue } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: fmt.Sprintf("%d", certItem.CertificateID), CertName: certItem.Name, ExtendedData: map[string]any{ diff --git a/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl.go b/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl.go index e1bdf6a4c..df487aa00 100644 --- a/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl.go +++ b/pkg/core/certmgr/providers/upyun-ssl/upyun_ssl.go @@ -5,10 +5,16 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" upyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/upyun/console" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 又拍云账号用户名。 Username string `json:"username"` @@ -22,7 +28,7 @@ type Certmgr struct { sdkClient *upyunsdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -49,7 +55,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 上传证书 uploadHttpsCertificateReq := &upyunsdk.UploadHttpsCertificateRequest{ Certificate: certPEM, @@ -61,13 +67,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'console.UploadHttpsCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: uploadHttpsCertificateResp.Data.Result.CertificateId, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(username, password string) (*upyunsdk.Client, error) { diff --git a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go index e309340c9..933da1c16 100644 --- a/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go +++ b/pkg/core/certmgr/providers/volcengine-cdn/volcengine_cdn.go @@ -13,11 +13,18 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" - "github.com/certimate-go/certimate/pkg/core/certmgr" vecdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn" + + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -33,7 +40,7 @@ type Certmgr struct { sdkClient *vecdn.CDN } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -60,7 +67,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -104,7 +111,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: ve.StringValue(certItem.CertId), CertName: ve.StringValue(certItem.Desc), }, nil @@ -134,14 +141,14 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'cdn.AddCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: ve.StringValue(addCertificateResp.CertId), CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, accessKeySecret string) (*vecdn.CDN, error) { diff --git a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go index b89daef8a..d48c12688 100644 --- a/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/pkg/core/certmgr/providers/volcengine-certcenter/volcengine_certcenter.go @@ -9,8 +9,15 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" - "github.com/certimate-go/certimate/pkg/core/certmgr" vecertificateservice "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/certificateservice" + + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult ) type CertmgrConfig struct { @@ -30,7 +37,7 @@ type Certmgr struct { sdkClient *vecertificateservice.CERTIFICATESERVICE } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -57,7 +64,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 上传证书 // REF: https://www.volcengine.com/docs/6638/1365580 importCertificateReq := &vecertificateservice.ImportCertificateInput{ @@ -86,13 +93,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("received empty certificate id, both `InstanceId` and `RepeatId` are empty") } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: sslId, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { - return nil, certmgr.ErrUnsupported +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { + return nil, core.ErrUnsupported } func createSDKClient(accessKeyId, secretAccessKey, region string) (*vecertificateservice.CERTIFICATESERVICE, error) { diff --git a/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go b/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go index 5a7026a51..112a34399 100644 --- a/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go +++ b/pkg/core/certmgr/providers/volcengine-live/volcengine_live.go @@ -11,10 +11,16 @@ import ( velive "github.com/volcengine/volc-sdk-golang/service/live/v20230101" ve "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -30,7 +36,7 @@ type Certmgr struct { sdkClient *velive.Live } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -56,7 +62,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 查询证书列表，避免重复上传 // REF: https://www.volcengine.com/docs/6469/1126823 listCertPageNum := 1 @@ -94,7 +100,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert oldCertPEM := strings.Join(describeCertDetailSecretResp.Result.SSL.Chain, "\n\n") if xcert.EqualCertificatesFromPEM(certPEM, oldCertPEM) { c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.ChainID, CertName: certItem.CertName, }, nil @@ -128,13 +134,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'live.CreateCert': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: *createCertResp.Result.ChainID, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { // 更新证书 // REF: https://www.volcengine.com/docs/6469/1126817 createCertReq := &velive.CreateCertBody{ @@ -152,5 +158,5 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'live.CreateCert': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } diff --git a/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate.go b/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate.go index 9171a9939..6ba02ca97 100644 --- a/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate.go +++ b/pkg/core/certmgr/providers/wangsu-certificate/wangsu_certificate.go @@ -10,11 +10,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" wangsusdk "github.com/certimate-go/certimate/pkg/sdk3rd/wangsu/certificate" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // 网宿云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -28,7 +34,7 @@ type Certmgr struct { sdkClient *wangsusdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -55,7 +61,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -87,7 +93,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.CertificateId, CertName: certItem.Name, }, nil @@ -119,13 +125,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("received empty certificate id") } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: wangsuCertIdMatches[1], CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { certId := certIdOrName certName := fmt.Sprintf("certimate_%d", time.Now().UnixMilli()) @@ -143,7 +149,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'certificatemanagement.UpdateCertificate': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret string) (*wangsusdk.Client, error) { diff --git a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go index e4b5ef5b0..c99a27a77 100644 --- a/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go +++ b/pkg/core/certmgr/providers/zenlayer-cdn/zenlayer_cdn.go @@ -14,11 +14,17 @@ import ( zcommon "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" zcdnsdk "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/cdn" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // Zenlayer AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -34,7 +40,7 @@ type Certmgr struct { sdkClient *zcdnsdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -61,7 +67,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -137,7 +143,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.CertificateId, CertName: certItem.CertificateLabel, }, nil @@ -166,13 +172,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'cdn.CreateCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: createCertificateResp.Response.CertificateId, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { // 更新证书 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/cdn/certificate/modifycertificate modifyCertificateReq := zcdnsdk.NewModifyCertificateRequest() @@ -185,7 +191,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'cdn.ModifyCertificate': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } func createSDKClient(accessKeyId, accessKeyPassword string) (*zcdnsdk.Client, error) { diff --git a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go index 662b38e59..d778fea55 100644 --- a/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go +++ b/pkg/core/certmgr/providers/zenlayer-ga/zenlayer_ga.go @@ -14,11 +14,17 @@ import ( zcommon "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" - "github.com/certimate-go/certimate/pkg/core/certmgr" + "github.com/certimate-go/certimate/pkg/core" zgasdk "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/zga" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Certmgr + UploadResult = core.CertmgrUploadResult + ReplaceResult = core.CertmgrReplaceResult +) + type CertmgrConfig struct { // Zenlayer AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -34,7 +40,7 @@ type Certmgr struct { sdkClient *zgasdk.Client } -var _ certmgr.Provider = (*Certmgr)(nil) +var _ Provider = (*Certmgr)(nil) func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) { if config == nil { @@ -61,7 +67,7 @@ func (c *Certmgr) SetLogger(logger *slog.Logger) { } } -func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*certmgr.UploadResult, error) { +func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*UploadResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -137,7 +143,7 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert // 如果以上信息都一致，则视为已存在相同证书，直接返回 c.logger.Info("ssl certificate already exists") - return &certmgr.UploadResult{ + return &UploadResult{ CertId: certItem.CertificateId, CertName: certItem.CertificateLabel, }, nil @@ -166,13 +172,13 @@ func (c *Certmgr) Upload(ctx context.Context, certPEM, privkeyPEM string) (*cert return nil, fmt.Errorf("failed to execute sdk request 'zga.CreateCertificate': %w", err) } - return &certmgr.UploadResult{ + return &UploadResult{ CertId: createCertificateResp.Response.CertificateId, CertName: certName, }, nil } -func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*certmgr.ReplaceResult, error) { +func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, privkeyPEM string) (*ReplaceResult, error) { // 更新证书 // REF: https://docs.console.zenlayer.com/api-reference/cn/networking/zga/certificate/modifycertificate modifyCertificateReq := zgasdk.NewModifyCertificateRequest() @@ -185,7 +191,7 @@ func (c *Certmgr) Replace(ctx context.Context, certIdOrName string, certPEM, pri return nil, fmt.Errorf("failed to execute sdk request 'zga.ModifyCertificate': %w", err) } - return &certmgr.ReplaceResult{}, nil + return &ReplaceResult{}, nil } func createSDKClient(accessKeyId, accessKeyPassword string) (*zgasdk.Client, error) { diff --git a/pkg/core/certmgr/typealias.go b/pkg/core/certmgr/typealias.go new file mode 100644 index 000000000..6b7222685 --- /dev/null +++ b/pkg/core/certmgr/typealias.go @@ -0,0 +1,11 @@ +package certmgr + +import ( + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Certmgr + ReplaceResult = core.CertmgrReplaceResult + UploadResult = core.CertmgrUploadResult +) diff --git a/pkg/core/deployer/provider.go b/pkg/core/deployer/provider.go deleted file mode 100644 index b7bde59ea..000000000 --- a/pkg/core/deployer/provider.go +++ /dev/null @@ -1,9 +0,0 @@ -package deployer - -import ( - "github.com/certimate-go/certimate/pkg/core" -) - -type Provider = core.Deployer - -type DeployResult = core.DeployerDeployResult diff --git a/pkg/core/deployer/providers/1panel-console/1panel_console.go b/pkg/core/deployer/providers/1panel-console/1panel_console.go index 95f7ec1b4..a1251ab12 100644 --- a/pkg/core/deployer/providers/1panel-console/1panel_console.go +++ b/pkg/core/deployer/providers/1panel-console/1panel_console.go @@ -7,11 +7,16 @@ import ( "log/slog" "strconv" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" onepanelsdk "github.com/certimate-go/certimate/pkg/sdk3rd/1panel" onepanelsdk2 "github.com/certimate-go/certimate/pkg/sdk3rd/1panel/v2" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 1Panel 服务地址。 ServerUrl string `json:"serverUrl"` @@ -32,7 +37,7 @@ type Deployer struct { sdkClient any } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -59,7 +64,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 设置面板 SSL 证书 switch sdkClient := d.sdkClient.(type) { case *onepanelsdk.Client: @@ -98,7 +103,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep panic("unreachable") } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } const ( diff --git a/pkg/core/deployer/providers/1panel/1panel.go b/pkg/core/deployer/providers/1panel/1panel.go index 9abe1e1fa..3acd02563 100644 --- a/pkg/core/deployer/providers/1panel/1panel.go +++ b/pkg/core/deployer/providers/1panel/1panel.go @@ -9,15 +9,19 @@ import ( "strconv" "time" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/1panel" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/1panel" onepanelsdk "github.com/certimate-go/certimate/pkg/sdk3rd/1panel" onepanelsdk2 "github.com/certimate-go/certimate/pkg/sdk3rd/1panel/v2" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 1Panel 服务地址。 ServerUrl string `json:"serverUrl"` @@ -48,10 +52,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient any - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -63,7 +67,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ ServerUrl: config.ServerUrl, ApiVersion: config.ApiVersion, ApiKey: config.ApiKey, @@ -92,7 +96,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_WEBSITE: @@ -109,7 +113,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToWebsite(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go index 8b03495a8..1cca938eb 100644 --- a/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go +++ b/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go @@ -14,15 +14,20 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" alialb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/alb-20200616/v2/client" alicas "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -49,10 +54,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClients *wSDKClients - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) type wSDKClients struct { ALB *alialb.Client @@ -69,7 +74,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -99,7 +104,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -130,7 +135,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string, cloudCertSANs []string) error { diff --git a/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go b/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go index 8f51d8e8d..9a6833690 100644 --- a/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go +++ b/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go @@ -13,14 +13,19 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" aliapig "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/apig-20240327/v6/client" alicloudapi "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cloudapi-20160714/v5/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -49,7 +54,7 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClients *wSDKClients - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } type wSDKClients struct { @@ -57,7 +62,7 @@ type wSDKClients struct { TraditionalAPIGateway *alicloudapi.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -69,7 +74,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -97,7 +102,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { switch d.config.ServiceType { case SERVICE_TYPE_TRADITIONAL: if err := d.deployToTraditional(ctx, certPEM, privkeyPEM); err != nil { @@ -113,7 +118,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported service type '%s'", string(d.config.ServiceType)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToTraditional(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go b/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go index 88d519c83..fafa56909 100644 --- a/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go +++ b/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go @@ -11,13 +11,18 @@ import ( "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" alicas "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cas-20200407/v4/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -38,10 +43,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *alicas.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -53,7 +58,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -81,7 +86,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if len(d.config.ResourceIds) == 0 { return nil, fmt.Errorf("config `resourceIds` is required") } @@ -153,7 +158,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, err } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret, region string) (*alicas.Client, error) { diff --git a/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go b/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go index a410b58ee..ffb3c9a0d 100644 --- a/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go +++ b/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -24,17 +28,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -61,7 +65,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -70,5 +74,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go b/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go index 6a07f4c8e..3c4c8f707 100644 --- a/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go +++ b/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go @@ -13,13 +13,18 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" alicdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/cdn-20180510/v9/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -40,10 +45,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *alicdn.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -55,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -83,7 +88,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -179,7 +184,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go index d39a8b53a..7507c52b6 100644 --- a/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go +++ b/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go @@ -10,10 +10,15 @@ import ( "github.com/alibabacloud-go/tea/dara" "github.com/alibabacloud-go/tea/tea" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-slb" - "github.com/certimate-go/certimate/pkg/core/deployer" alislb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/slb-20140515/v4/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-slb" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -42,10 +47,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *alislb.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -57,7 +62,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -85,7 +90,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -110,7 +115,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go b/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go index 0197e956b..6d52a5c94 100644 --- a/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go +++ b/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go @@ -13,13 +13,18 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" alidcdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/dcdn-20180115/v4/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -40,10 +45,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *alidcdn.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -55,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -83,7 +88,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -179,7 +184,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go b/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go index 17723d36c..3869247dd 100644 --- a/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go +++ b/pkg/core/deployer/providers/aliyun-ddospro/aliyun_ddospro.go @@ -12,13 +12,18 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" aliddoscoo "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ddoscoo-20200101/v5/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -39,10 +44,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *aliddoscoo.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -84,7 +89,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -171,7 +176,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas.go b/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas.go index b6f0c1690..882915a20 100644 --- a/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas.go +++ b/pkg/core/deployer/providers/aliyun-esa-saas/aliyun_esasaas.go @@ -13,13 +13,18 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" aliesa "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -42,10 +47,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *aliesa.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -57,7 +62,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -87,7 +92,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.SiteId == 0 { return nil, fmt.Errorf("config `siteId` is required") } @@ -205,7 +210,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllHostnames(ctx context.Context) ([]*aliesa.ListCustomHostnamesResponseBodyHostnames, error) { diff --git a/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go b/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go index c72b04cf2..33a8ffc02 100644 --- a/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go +++ b/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go @@ -13,10 +13,15 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" aliesa "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/esa-20240910/v2/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -36,10 +41,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *aliesa.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -51,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -81,7 +86,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.SiteId == 0 { return nil, fmt.Errorf("config `siteId` is required") } @@ -109,13 +114,13 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep var sdkError *tea.SDKError if errors.As(err, &sdkError) { if tea.StringValue(sdkError.Code) == "Certificate.Duplicated" { - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } } return nil, fmt.Errorf("failed to execute sdk request 'esa.SetCertificate': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret, region string) (*aliesa.Client, error) { diff --git a/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go b/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go index 0b804e5dd..53fe8bfd9 100644 --- a/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go +++ b/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go @@ -13,12 +13,18 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" alifc "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-20230330/v4/client" alifcopen "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/fc-open-20210406/v2/client" + + "github.com/certimate-go/certimate/pkg/core" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -44,7 +50,7 @@ type Deployer struct { sdkClients *wSDKClients } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) type wSDKClients struct { FC2 *alifcopen.Client @@ -76,7 +82,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { switch d.config.ServiceVersion { case "2", "2.0": if err := d.deployToFC2(ctx, certPEM, privkeyPEM); err != nil { @@ -92,7 +98,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported service version '%s'", d.config.ServiceVersion) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToFC3(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go index f6c1acab4..66ccdc7bf 100644 --- a/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go +++ b/pkg/core/deployer/providers/aliyun-ga/aliyun_ga.go @@ -12,10 +12,15 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" aliga "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/ga-20191120/v4/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -41,10 +46,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *aliga.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -56,7 +61,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -84,7 +89,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -109,7 +114,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToAccelerator(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/aliyun-live/aliyun_live.go b/pkg/core/deployer/providers/aliyun-live/aliyun_live.go index fff81b371..61daec270 100644 --- a/pkg/core/deployer/providers/aliyun-live/aliyun_live.go +++ b/pkg/core/deployer/providers/aliyun-live/aliyun_live.go @@ -13,11 +13,17 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" alilive "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/live-20161101/v2/client" + + "github.com/certimate-go/certimate/pkg/core" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -40,7 +46,7 @@ type Deployer struct { sdkClient *alilive.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -67,7 +73,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 获取待部署的域名列表 var domains []string switch d.config.DomainMatchPattern { @@ -147,7 +153,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go index 3ed2ca608..2b9b071fc 100644 --- a/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go +++ b/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go @@ -12,10 +12,15 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" alinlb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/nlb-20220430/v4/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -41,10 +46,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *alinlb.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -56,7 +61,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -86,7 +91,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -111,7 +116,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go b/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go index 93f3f0475..5bcf64980 100644 --- a/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go +++ b/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go @@ -9,7 +9,12 @@ import ( "github.com/aliyun/alibabacloud-oss-go-sdk-v2/oss" "github.com/aliyun/alibabacloud-oss-go-sdk-v2/oss/credentials" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -33,7 +38,7 @@ type Deployer struct { sdkClient *oss.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -60,7 +65,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Bucket == "" { return nil, fmt.Errorf("config `bucket` is required") } @@ -87,7 +92,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'oss.PutCname': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret, region string) (*oss.Client, error) { diff --git a/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go b/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go index 8af5be76d..f4c685f0d 100644 --- a/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go +++ b/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go @@ -13,13 +13,18 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" alivod "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/vod-20170321/v4/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 阿里云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -40,10 +45,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *alivod.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -55,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -83,7 +88,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -178,7 +183,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go b/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go index 5be846fbe..55b07a4c6 100644 --- a/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go +++ b/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go @@ -12,10 +12,15 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" - "github.com/certimate-go/certimate/pkg/core/deployer" aliwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/alibabacloud-go/waf-openapi-20211001/v7/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aliyun-cas" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -51,10 +56,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *aliwaf.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -66,7 +71,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, ResourceGroupId: config.ResourceGroupId, @@ -96,7 +101,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { switch d.config.ServiceVersion { case "3", "3.0": if err := d.deployToWAF3(ctx, certPEM, privkeyPEM); err != nil { @@ -107,7 +112,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported service version '%s'", d.config.ServiceVersion) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToWAF3(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/apisix/apisix.go b/pkg/core/deployer/providers/apisix/apisix.go index 06913a4dd..79515380c 100644 --- a/pkg/core/deployer/providers/apisix/apisix.go +++ b/pkg/core/deployer/providers/apisix/apisix.go @@ -8,11 +8,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" apisixsdk "github.com/certimate-go/certimate/pkg/sdk3rd/apisix" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // APISIX 服务地址。 ServerUrl string `json:"serverUrl"` @@ -33,7 +38,7 @@ type Deployer struct { sdkClient *apisixsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -60,7 +65,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -72,7 +77,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/aws-acm/aws_acm.go b/pkg/core/deployer/providers/aws-acm/aws_acm.go index 85ae5db1e..3dc8021f7 100644 --- a/pkg/core/deployer/providers/aws-acm/aws_acm.go +++ b/pkg/core/deployer/providers/aws-acm/aws_acm.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -25,17 +29,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, Region: config.Region, @@ -61,7 +65,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.CertificateArn == "" { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) @@ -80,5 +84,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go b/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go index 4920b8d5a..a922090f6 100644 --- a/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go +++ b/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go @@ -11,10 +11,14 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudfront" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimplacm "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" - certmgrimpliam "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimplacm "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-acm" + cmgrimpliam "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -35,10 +39,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *cloudfront.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -50,10 +54,10 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - var pcertmgr certmgr.Provider + var pcertmgr core.Certmgr switch config.CertificateSource { case CERTIFICATE_SOURCE_ACM: - pcertmgr, err = certmgrimplacm.NewCertmgr(&certmgrimplacm.CertmgrConfig{ + pcertmgr, err = cmgrimplacm.NewCertmgr(&cmgrimplacm.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, Region: config.Region, @@ -63,7 +67,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { } case CERTIFICATE_SOURCE_IAM: - pcertmgr, err = certmgrimpliam.NewCertmgr(&certmgrimpliam.CertmgrConfig{ + pcertmgr, err = cmgrimpliam.NewCertmgr(&cmgrimpliam.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, Region: config.Region, @@ -95,7 +99,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.DistributionId == "" { return nil, fmt.Errorf("config `distribuitionId` is required") } @@ -151,7 +155,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'cloudfront.UpdateDistribution': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey, region string) (*cloudfront.Client, error) { diff --git a/pkg/core/deployer/providers/aws-iam/aws_iam.go b/pkg/core/deployer/providers/aws-iam/aws_iam.go index d3ba06de6..d5bcf644c 100644 --- a/pkg/core/deployer/providers/aws-iam/aws_iam.go +++ b/pkg/core/deployer/providers/aws-iam/aws_iam.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/aws-iam" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -25,17 +29,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, Region: config.Region, @@ -62,7 +66,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -71,5 +75,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go b/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go index 429d202c3..fddfafc68 100644 --- a/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go +++ b/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/azure-keyvault" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/azure-keyvault" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -29,17 +33,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ TenantId: config.TenantId, ClientId: config.ClientId, ClientSecret: config.ClientSecret, @@ -67,7 +71,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.CertificateName == "" { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) @@ -86,5 +90,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go index fb4ce514f..247636a4a 100644 --- a/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go +++ b/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go @@ -12,9 +12,13 @@ import ( "github.com/pocketbase/pocketbase/tools/security" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -41,10 +45,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *bceappblb.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -56,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -80,7 +84,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -105,7 +109,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go index ac9cbcce5..6382f52c8 100644 --- a/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go +++ b/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go @@ -12,9 +12,13 @@ import ( "github.com/pocketbase/pocketbase/tools/security" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -41,10 +45,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *bceblb.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -56,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -80,7 +84,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -105,7 +109,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go b/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go index 3e7fdec98..9dcb076d7 100644 --- a/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go +++ b/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go @@ -10,12 +10,17 @@ import ( bcecdn "github.com/baidubce/bce-sdk-go/services/cdn" bcecdnapi "github.com/baidubce/bce-sdk-go/services/cdn/api" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" "github.com/samber/lo" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 百度智能云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -34,7 +39,7 @@ type Deployer struct { sdkClient *bcecdn.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -61,7 +66,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 获取待部署的域名列表 var domains []string switch d.config.DomainMatchPattern { @@ -139,7 +144,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go b/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go index 55f87132e..de0236d8d 100644 --- a/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go +++ b/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baiducloud-cert" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -20,17 +24,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -53,7 +57,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -62,5 +66,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go index a2cabac13..6c9720758 100644 --- a/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go +++ b/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go @@ -8,12 +8,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baishan-cdn" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/baishan-cdn" baishansdk "github.com/certimate-go/certimate/pkg/sdk3rd/baishan" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 白山云 API Token。 ApiToken string `json:"apiToken"` @@ -33,10 +37,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *baishansdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -48,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ ApiToken: config.ApiToken, }) if err != nil { @@ -71,7 +75,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_DOMAIN: @@ -88,7 +92,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToDomain(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go b/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go index 1f7121a0b..c99b7cebb 100644 --- a/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go +++ b/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go @@ -6,10 +6,15 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" btsdk "github.com/certimate-go/certimate/pkg/sdk3rd/btpanel" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 宝塔面板服务地址。 ServerUrl string `json:"serverUrl"` @@ -27,7 +32,7 @@ type Deployer struct { sdkClient *btsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 设置面板 SSL 证书 configSavePanelSSLReq := &btsdk.ConfigSavePanelSSLRequest{ PrivateKey: privkeyPEM, @@ -76,7 +81,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Debug("sdk request 'system.ServiceAdmin'", slog.Any("request", systemServiceAdminReq), slog.Any("response", systemServiceAdminResp)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(serverUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { diff --git a/pkg/core/deployer/providers/baotapanel/baotapanel.go b/pkg/core/deployer/providers/baotapanel/baotapanel.go index df04d2477..8db9a2880 100644 --- a/pkg/core/deployer/providers/baotapanel/baotapanel.go +++ b/pkg/core/deployer/providers/baotapanel/baotapanel.go @@ -10,11 +10,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" btsdk "github.com/certimate-go/certimate/pkg/sdk3rd/btpanel" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 宝塔面板服务地址。 ServerUrl string `json:"serverUrl"` @@ -34,7 +39,7 @@ type Deployer struct { sdkClient *btsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) var btProjectTypes = []string{"php", "java", "nodejs", "go", "python", "proxy", "html", "general"} @@ -63,7 +68,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if len(d.config.SiteNames) == 0 { return nil, fmt.Errorf("config `siteNames` is required") } @@ -126,7 +131,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) updateSiteCertificate(ctx context.Context, siteType, siteName string, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console.go b/pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console.go index 16d0ef915..7ee0cf008 100644 --- a/pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console.go +++ b/pkg/core/deployer/providers/baotapanelgo-console/baotapanelgo_console.go @@ -8,10 +8,15 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" btsdk "github.com/certimate-go/certimate/pkg/sdk3rd/btpanelgo" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 宝塔面板服务地址。 ServerUrl string `json:"serverUrl"` @@ -27,7 +32,7 @@ type Deployer struct { sdkClient *btsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 设置面板 SSL 证书 configSetPanelSSLReq := &btsdk.ConfigSetPanelSSLRequest{ SSLStatus: lo.ToPtr(int32(1)), @@ -67,7 +72,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'config.SetPanelSSL': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(serverUrl, apiKey string, skipTlsVerify bool) (*btsdk.Client, error) { diff --git a/pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go b/pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go index a7f16395a..628e4f0aa 100644 --- a/pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go +++ b/pkg/core/deployer/providers/baotapanelgo/baotapanelgo.go @@ -13,12 +13,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" btsdk "github.com/certimate-go/certimate/pkg/sdk3rd/btpanelgo" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 宝塔面板服务地址。 ServerUrl string `json:"serverUrl"` @@ -38,7 +43,7 @@ type Deployer struct { sdkClient *btsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) var ( btProjectTypes = []string{"php", "java", "asp", "go", "python", "nodejs", "proxy", "general"} @@ -70,7 +75,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if len(d.config.SiteNames) == 0 { return nil, fmt.Errorf("config `siteNames` is required") } @@ -99,7 +104,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, errors.Join(errs...) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) findSiteByName(ctx context.Context, siteType, siteName string) (*btsdk.SiteData, error) { diff --git a/pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go b/pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go index 8f5979d7c..bc1c7cfad 100644 --- a/pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go +++ b/pkg/core/deployer/providers/baotawaf-console/baotawaf_console.go @@ -8,10 +8,15 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" btwafsdk "github.com/certimate-go/certimate/pkg/sdk3rd/btwaf" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 堡塔云 WAF 服务地址。 ServerUrl string `json:"serverUrl"` @@ -27,7 +32,7 @@ type Deployer struct { sdkClient *btwafsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 设置面板 SSL configSetCertReq := &btwafsdk.ConfigSetCertRequest{ CertContent: lo.ToPtr(certPEM), @@ -66,7 +71,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'config.SetCert': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(serverUrl, apiKey string, skipTlsVerify bool) (*btwafsdk.Client, error) { diff --git a/pkg/core/deployer/providers/baotawaf/baotawaf.go b/pkg/core/deployer/providers/baotawaf/baotawaf.go index 39daecbe6..971073d7f 100644 --- a/pkg/core/deployer/providers/baotawaf/baotawaf.go +++ b/pkg/core/deployer/providers/baotawaf/baotawaf.go @@ -10,11 +10,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" btwafsdk "github.com/certimate-go/certimate/pkg/sdk3rd/btwaf" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 堡塔云 WAF 服务地址。 ServerUrl string `json:"serverUrl"` @@ -35,7 +40,7 @@ type Deployer struct { sdkClient *btwafsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -62,7 +67,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if len(d.config.SiteNames) == 0 { return nil, fmt.Errorf("config `siteNames` is required") } @@ -85,7 +90,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, errors.Join(errs...) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) findSiteByName(ctx context.Context, siteName string) (*btwafsdk.SiteRecord, error) { diff --git a/pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go b/pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go index 5928d8fff..74e0499ee 100644 --- a/pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go +++ b/pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go @@ -6,10 +6,15 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" bunnysdk "github.com/certimate-go/certimate/pkg/sdk3rd/bunny" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Bunny API Key。 ApiKey string `json:"apiKey"` @@ -25,7 +30,7 @@ type Deployer struct { sdkClient *bunnysdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -52,7 +57,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.PullZoneId == "" { return nil, fmt.Errorf("config `pullZoneId` is required") } @@ -72,7 +77,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'cdn.AddCustomCertificate': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(apiKey string) (*bunnysdk.Client, error) { diff --git a/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go b/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go index 7b66ed660..500d8ba33 100644 --- a/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go +++ b/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go @@ -10,12 +10,16 @@ import ( bpcdn "github.com/byteplus-sdk/byteplus-sdk-golang/service/cdn" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-cdn" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-cdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // BytePlus AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -34,10 +38,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *bpcdn.CDN - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -48,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client.Client.SetAccessKey(config.AccessKeyId) client.Client.SetSecretKey(config.SecretAccessKey) - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -74,7 +78,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -150,7 +154,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getMatchedDomainsByWildcard(ctx context.Context, wildcardDomain string) ([]string, error) { diff --git a/pkg/core/deployer/providers/byteplus-certcenter/byteplus_certcenter.go b/pkg/core/deployer/providers/byteplus-certcenter/byteplus_certcenter.go index aeda4647f..c7b8e7059 100644 --- a/pkg/core/deployer/providers/byteplus-certcenter/byteplus_certcenter.go +++ b/pkg/core/deployer/providers/byteplus-certcenter/byteplus_certcenter.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-certcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -24,17 +28,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -61,7 +65,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -70,5 +74,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/byteplus-medialive/byteplus_medialive.go b/pkg/core/deployer/providers/byteplus-medialive/byteplus_medialive.go index cab67b407..2474c6df3 100644 --- a/pkg/core/deployer/providers/byteplus-medialive/byteplus_medialive.go +++ b/pkg/core/deployer/providers/byteplus-medialive/byteplus_medialive.go @@ -11,12 +11,16 @@ import ( bplive "github.com/byteplus-sdk/byteplus-sdk-golang/service/live/v20230101" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-medialive" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-medialive" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // BytePlus AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -35,10 +39,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *bplive.Live - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -49,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client.SetAccessKey(config.AccessKeyId) client.SetSecretKey(config.SecretAccessKey) - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -76,7 +80,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -162,7 +166,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/byteplus-tos/byteplus_tos.go b/pkg/core/deployer/providers/byteplus-tos/byteplus_tos.go index 4333616ed..0bb7bc0d7 100644 --- a/pkg/core/deployer/providers/byteplus-tos/byteplus_tos.go +++ b/pkg/core/deployer/providers/byteplus-tos/byteplus_tos.go @@ -7,9 +7,13 @@ import ( "github.com/volcengine/ve-tos-golang-sdk/v2/tos" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/byteplus-certcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -31,10 +35,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tos.ClientV2 - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -46,7 +50,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -74,7 +78,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Bucket == "" { return nil, fmt.Errorf("config `bucket` is required") } @@ -106,7 +110,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'tos.PutBucketCustomDomain': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey, region string) (*tos.ClientV2, error) { diff --git a/pkg/core/deployer/providers/cachefly/cachefly.go b/pkg/core/deployer/providers/cachefly/cachefly.go index b2b9853cd..8da2aefc3 100644 --- a/pkg/core/deployer/providers/cachefly/cachefly.go +++ b/pkg/core/deployer/providers/cachefly/cachefly.go @@ -7,10 +7,15 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" cacheflysdk "github.com/certimate-go/certimate/pkg/sdk3rd/cachefly" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // CacheFly API Token。 ApiToken string `json:"apiToken"` @@ -22,7 +27,7 @@ type Deployer struct { sdkClient *cacheflysdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -49,7 +54,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 // REF: https://api.cachefly.com/api/2.5/docs#tag/Certificates/paths/~1certificates/post createCertificateReq := &cacheflysdk.CreateCertificateRequest{ @@ -62,7 +67,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'CreateCertificate': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(apiToken string) (*cacheflysdk.Client, error) { diff --git a/pkg/core/deployer/providers/cdnfly/cdnfly.go b/pkg/core/deployer/providers/cdnfly/cdnfly.go index 021e9b85b..584b7148b 100644 --- a/pkg/core/deployer/providers/cdnfly/cdnfly.go +++ b/pkg/core/deployer/providers/cdnfly/cdnfly.go @@ -10,10 +10,15 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" cdnflysdk "github.com/certimate-go/certimate/pkg/sdk3rd/cdnfly" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Cdnfly 服务地址。 ServerUrl string `json:"serverUrl"` @@ -39,7 +44,7 @@ type Deployer struct { sdkClient *cdnflysdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -66,7 +71,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_WEBSITE: @@ -83,7 +88,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToSite(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/cpanel/cpanel.go b/pkg/core/deployer/providers/cpanel/cpanel.go index e86b226dc..c9851ea26 100644 --- a/pkg/core/deployer/providers/cpanel/cpanel.go +++ b/pkg/core/deployer/providers/cpanel/cpanel.go @@ -8,11 +8,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" cpanelsdk "github.com/certimate-go/certimate/pkg/sdk3rd/cpanel" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // cPanel 服务地址。 ServerUrl string `json:"serverUrl"` @@ -35,7 +40,7 @@ type Deployer struct { sdkClient *cpanelsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -62,7 +67,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_WEBSITE: @@ -74,7 +79,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToWebsite(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao.go b/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao.go index e371fefef..1ed985cac 100644 --- a/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao.go +++ b/pkg/core/deployer/providers/ctcccloud-ao/ctcccloud_ao.go @@ -10,13 +10,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-ao" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-ao" ctyunao "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/ao" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -33,10 +37,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ctyunao.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -48,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -72,7 +76,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -158,7 +162,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn.go b/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn.go index e28a803a7..17d84199f 100644 --- a/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn.go +++ b/pkg/core/deployer/providers/ctcccloud-cdn/ctcccloud_cdn.go @@ -9,13 +9,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cdn" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cdn" ctyuncdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/cdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -32,10 +36,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ctyuncdn.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -47,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -71,7 +75,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -157,7 +161,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go b/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go index 456d0d683..3092ac337 100644 --- a/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go +++ b/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cms" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-cms" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -20,17 +24,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -53,7 +57,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -62,5 +66,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go index 0625cad49..b9ff735ef 100644 --- a/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go +++ b/pkg/core/deployer/providers/ctcccloud-elb/ctcccloud_elb.go @@ -9,12 +9,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-elb" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-elb" ctyunelb "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/elb" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -36,10 +40,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ctyunelb.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -51,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, RegionId: config.RegionId, @@ -76,7 +80,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -101,7 +105,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go b/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go index 5f3deb55c..a1d25665c 100644 --- a/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go +++ b/pkg/core/deployer/providers/ctcccloud-faas/ctcccloud_faas.go @@ -9,11 +9,15 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" ctyunfaas "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/faas" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -29,10 +33,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ctyunfaas.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -59,7 +63,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.RegionId == "" { return nil, fmt.Errorf("config `regionId` is required") } @@ -86,7 +90,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep if faasCustomDomain.CertConfig != nil && faasCustomDomain.CertConfig.Certificate == certPEM && faasCustomDomain.CertConfig.PrivateKey == privkeyPEM { - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } } @@ -116,7 +120,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'faas.UpdateCustomDomain': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey string) (*ctyunfaas.Client, error) { diff --git a/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn.go b/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn.go index 38f632986..93eb7262c 100644 --- a/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn.go +++ b/pkg/core/deployer/providers/ctcccloud-icdn/ctcccloud_icdn.go @@ -9,13 +9,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-icdn" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-icdn" ctyunicdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/icdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -32,10 +36,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ctyunicdn.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -47,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -71,7 +75,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -157,7 +161,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn.go b/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn.go index bb312fe9e..5ded96268 100644 --- a/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn.go +++ b/pkg/core/deployer/providers/ctcccloud-lvdn/ctcccloud_lvdn.go @@ -8,13 +8,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-lvdn" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ctcccloud-lvdn" ctyunlvdn "github.com/certimate-go/certimate/pkg/sdk3rd/ctyun/lvdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 天翼云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -31,10 +35,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ctyunlvdn.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -46,7 +50,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, }) @@ -70,7 +74,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -133,7 +137,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go b/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go index 314623a16..ac63ff4b5 100644 --- a/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go +++ b/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go @@ -9,13 +9,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dogecloud" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dogecloud" dogesdk "github.com/certimate-go/certimate/pkg/sdk3rd/dogecloud" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 多吉云 AccessKey。 AccessKey string `json:"accessKey"` @@ -32,10 +36,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *dogesdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -47,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) @@ -73,7 +77,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -137,7 +141,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/dokploy/dokploy.go b/pkg/core/deployer/providers/dokploy/dokploy.go index e43264b7c..0881c58a2 100644 --- a/pkg/core/deployer/providers/dokploy/dokploy.go +++ b/pkg/core/deployer/providers/dokploy/dokploy.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dokploy" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/dokploy" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -22,17 +26,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ ServerUrl: config.ServerUrl, ApiKey: config.ApiKey, AllowInsecureConnections: config.AllowInsecureConnections, @@ -58,7 +62,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -67,5 +71,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/flexcdn/flexcdn.go b/pkg/core/deployer/providers/flexcdn/flexcdn.go index b1003fa78..901ea6872 100644 --- a/pkg/core/deployer/providers/flexcdn/flexcdn.go +++ b/pkg/core/deployer/providers/flexcdn/flexcdn.go @@ -8,11 +8,16 @@ import ( "log/slog" "time" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" flexcdnsdk "github.com/certimate-go/certimate/pkg/sdk3rd/flexcdn" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // FlexCDN 服务地址。 ServerUrl string `json:"serverUrl"` @@ -38,7 +43,7 @@ type Deployer struct { sdkClient *flexcdnsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -65,7 +70,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -77,7 +82,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/flyio/flyio.go b/pkg/core/deployer/providers/flyio/flyio.go index 2f3e9e1c0..4fc7a7e60 100644 --- a/pkg/core/deployer/providers/flyio/flyio.go +++ b/pkg/core/deployer/providers/flyio/flyio.go @@ -5,10 +5,15 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" flyiosdk "github.com/certimate-go/certimate/pkg/sdk3rd/flyio" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Fly.io API Token。 ApiToken string `json:"apiToken"` @@ -24,7 +29,7 @@ type Deployer struct { sdkClient *flyiosdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -51,7 +56,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.AppName == "" { return nil, fmt.Errorf("config `appName` is required") } @@ -73,7 +78,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'ImportCustomCertificate': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(apiToken string) (*flyiosdk.Client, error) { diff --git a/pkg/core/deployer/providers/ftp/ftp.go b/pkg/core/deployer/providers/ftp/ftp.go index dacaa607f..9bccdfe7a 100644 --- a/pkg/core/deployer/providers/ftp/ftp.go +++ b/pkg/core/deployer/providers/ftp/ftp.go @@ -7,11 +7,16 @@ import ( "path/filepath" "github.com/certimate-go/certimate/internal/tools/ftp" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xcertpfx "github.com/certimate-go/certimate/pkg/utils/cert/pfx" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // FTP 主机。 FtpHost string `json:"ftpHost"` @@ -56,7 +61,7 @@ type Deployer struct { logger *slog.Logger } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -77,7 +82,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -216,7 +221,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported file format '%s'", d.config.FileFormat) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createFtpClient(config DeployerConfig) (*ftp.Client, error) { diff --git a/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go b/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go index e09972d9d..e6fc15a77 100644 --- a/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go +++ b/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go @@ -11,12 +11,16 @@ import ( "github.com/G-Core/gcorelabscdn-go/resources" "github.com/G-Core/gcorelabscdn-go/sslcerts" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/gcore-cdn" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/gcore-cdn" gcoresdk "github.com/certimate-go/certimate/pkg/sdk3rd/gcore" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // G-Core API Token。 ApiToken string `json:"apiToken"` @@ -31,10 +35,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClients *wSDKClients - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) type wSDKClients struct { Resources *resources.Service @@ -51,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ ApiToken: config.ApiToken, }) if err != nil { @@ -76,7 +80,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.ResourceId == 0 { return nil, fmt.Errorf("config `resourceId` is required") } @@ -152,7 +156,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'resources.Update': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClients(apiToken string) (*wSDKClients, error) { diff --git a/pkg/core/deployer/providers/goedge/goedge.go b/pkg/core/deployer/providers/goedge/goedge.go index bb1321a95..b96b6b57a 100644 --- a/pkg/core/deployer/providers/goedge/goedge.go +++ b/pkg/core/deployer/providers/goedge/goedge.go @@ -8,11 +8,16 @@ import ( "log/slog" "time" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" goedgesdk "github.com/certimate-go/certimate/pkg/sdk3rd/goedge" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // GoEdge 服务地址。 ServerUrl string `json:"serverUrl"` @@ -38,7 +43,7 @@ type Deployer struct { sdkClient *goedgesdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -65,7 +70,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -77,7 +82,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad.go b/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad.go index cb226603a..76cf0ead7 100644 --- a/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad.go +++ b/pkg/core/deployer/providers/huaweicloud-aad/huaweicloud_aad.go @@ -13,12 +13,18 @@ import ( hwaadmodelv2 "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2/model" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" hwaadv1 "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v1" hwaadv2 "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/aad/v2" + + "github.com/certimate-go/certimate/pkg/core" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 华为云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -41,7 +47,7 @@ type Deployer struct { sdkClients *wSDKClients } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) type wSDKClients struct { AADv1 *hwaadv1.AadClient @@ -73,7 +79,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.InstanceId == "" { return nil, fmt.Errorf("config `instanceId` is required") } @@ -172,7 +178,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomainsByInstanceId(ctx context.Context, cloudInstanceId string) ([]*hwaadmodelv2.InstanceDomainItem, error) { diff --git a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go index 97217ac72..cab43f236 100644 --- a/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go +++ b/pkg/core/deployer/providers/huaweicloud-apig/huaweicloud_apig.go @@ -15,8 +15,14 @@ import ( hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" hwapig "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2" + + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -41,7 +47,7 @@ type Deployer struct { sdkClient *hwapig.ApigClient } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -72,7 +78,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -84,7 +90,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go b/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go index 95b7de29b..41b31eb4e 100644 --- a/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go +++ b/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go @@ -12,13 +12,18 @@ import ( hwcdnregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/region" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" - "github.com/certimate-go/certimate/pkg/core/deployer" hwcdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 华为云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -39,10 +44,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *hwcdn.CdnClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -58,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -85,7 +90,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -173,7 +178,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go index 20f212653..e5bf0591d 100644 --- a/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go @@ -16,10 +16,15 @@ import ( hwiamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-elb" - "github.com/certimate-go/certimate/pkg/core/deployer" hwelb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/elb/v3" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-elb" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -48,10 +53,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *hwelb.ElbClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -63,7 +68,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -91,7 +96,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -113,7 +118,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live.go b/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live.go index 2b1ff99f8..733823443 100644 --- a/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live.go +++ b/pkg/core/deployer/providers/huaweicloud-live/huaweicloud_live.go @@ -15,13 +15,18 @@ import ( hwliveregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1/region" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" - "github.com/certimate-go/certimate/pkg/core/deployer" hwlive "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/live/v1" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 华为云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -42,10 +47,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *hwlive.LiveClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -61,7 +66,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -88,7 +93,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -151,7 +156,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs.go b/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs.go index 2bd7c2ff9..c22c9ac72 100644 --- a/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs.go +++ b/pkg/core/deployer/providers/huaweicloud-obs/huaweicloud_obs.go @@ -12,7 +12,12 @@ import ( "net/http" "time" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -33,7 +38,7 @@ type Deployer struct { logger *slog.Logger } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Region == "" { return nil, fmt.Errorf("config `region` is required") } @@ -121,5 +126,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("huaweicloud obs api error: unexpected status code: %d (resp: %s)", resp.StatusCode, body.String()) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go b/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go index fd8b234a2..30e94119a 100644 --- a/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-scm" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -22,17 +26,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -58,7 +62,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -67,5 +71,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go index bd5a04a4e..3ba0aaf92 100644 --- a/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go @@ -15,10 +15,15 @@ import ( hwwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-waf" - "github.com/certimate-go/certimate/pkg/core/deployer" hwwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/huaweicloud-waf" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -44,10 +49,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *hwwaf.WafClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -59,7 +64,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, EnterpriseProjectId: config.EnterpriseProjectId, @@ -87,7 +92,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -117,7 +122,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go index c90ae2477..4028adaf6 100644 --- a/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go +++ b/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go @@ -13,10 +13,15 @@ import ( jdlbmodels "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/models" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" jdlb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/lb/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -43,10 +48,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *jdlb.LbClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -58,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -84,7 +89,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -109,7 +114,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go b/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go index 98855822c..8e60266fa 100644 --- a/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go +++ b/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go @@ -11,13 +11,18 @@ import ( jdcdnapis "github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/apis" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" jdcdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 京东云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -34,10 +39,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *jdcdn.CdnClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -49,7 +54,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -75,7 +80,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -161,7 +166,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go b/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go index 70f0123b6..81ec74f7c 100644 --- a/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go +++ b/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go @@ -10,11 +10,17 @@ import ( jdliveapis "github.com/jdcloud-api/jdcloud-sdk-go/services/live/apis" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" jdlive "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/live/client" + + "github.com/certimate-go/certimate/pkg/core" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 京东云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -33,7 +39,7 @@ type Deployer struct { sdkClient *jdlive.LiveClient } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -60,7 +66,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 获取待部署的域名列表 var domains []string switch d.config.DomainMatchPattern { @@ -115,7 +121,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/jdcloud-ssl/jdcloud_ssl.go b/pkg/core/deployer/providers/jdcloud-ssl/jdcloud_ssl.go index 21ef20cbc..ba22c8dc0 100644 --- a/pkg/core/deployer/providers/jdcloud-ssl/jdcloud_ssl.go +++ b/pkg/core/deployer/providers/jdcloud-ssl/jdcloud_ssl.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -20,17 +24,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -55,7 +59,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -64,5 +68,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go b/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go index 2581de742..710325ad2 100644 --- a/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go +++ b/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go @@ -12,11 +12,17 @@ import ( jdvodapis "github.com/jdcloud-api/jdcloud-sdk-go/services/vod/apis" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" jdvod "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/vod/client" + + "github.com/certimate-go/certimate/pkg/core" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 京东云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -35,7 +41,7 @@ type Deployer struct { sdkClient *jdvod.VodClient } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -62,7 +68,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 获取待部署的域名列表 var domains []string switch d.config.DomainMatchPattern { @@ -117,7 +123,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf.go b/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf.go index b426be952..c2af898a0 100644 --- a/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf.go +++ b/pkg/core/deployer/providers/jdcloud-waf/jdcloud_waf.go @@ -9,10 +9,15 @@ import ( jdwafapis "github.com/jdcloud-api/jdcloud-sdk-go/services/waf/apis" jdwafmodels "github.com/jdcloud-api/jdcloud-sdk-go/services/waf/models" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" jdwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/jdcloud-api/jdcloud-sdk-go/services/waf/client" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/jdcloud-ssl" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -32,10 +37,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *jdwaf.WafClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -47,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -73,7 +78,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -98,7 +103,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'waf.BindCert': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret string) (*jdwaf.WafClient, error) { diff --git a/pkg/core/deployer/providers/k8s-secret/k8s_secret.go b/pkg/core/deployer/providers/k8s-secret/k8s_secret.go index b8b8d914c..67184cf58 100644 --- a/pkg/core/deployer/providers/k8s-secret/k8s_secret.go +++ b/pkg/core/deployer/providers/k8s-secret/k8s_secret.go @@ -12,11 +12,17 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/certimate-go/certimate/pkg/core/deployer" typedcore "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/k8s.io/client-go/kubernetes/typed/core/v1" + + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // kubeconfig 文件内容。 KubeConfig string `json:"kubeConfig,omitempty"` @@ -47,7 +53,7 @@ type Deployer struct { logger *slog.Logger } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -68,7 +74,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Namespace == "" { return nil, fmt.Errorf("config `namespace` is required") } @@ -186,7 +192,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createK8sClient(kubeConfig string) (*typedcore.CoreV1Client, error) { diff --git a/pkg/core/deployer/providers/kong/kong.go b/pkg/core/deployer/providers/kong/kong.go index 89a1f0258..0fb9ceda6 100644 --- a/pkg/core/deployer/providers/kong/kong.go +++ b/pkg/core/deployer/providers/kong/kong.go @@ -9,11 +9,16 @@ import ( "github.com/kong/go-kong/kong" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xhttp "github.com/certimate-go/certimate/pkg/utils/http" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Kong 服务地址。 ServerUrl string `json:"serverUrl"` @@ -37,7 +42,7 @@ type Deployer struct { sdkClient *kong.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -64,7 +69,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -76,7 +81,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn.go b/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn.go index a1b3813e7..23452e39a 100644 --- a/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn.go +++ b/pkg/core/deployer/providers/ksyun-cdn/ksyun_cdn.go @@ -13,10 +13,15 @@ import ( "github.com/go-viper/mapstructure/v2" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 金山云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -40,7 +45,7 @@ type Deployer struct { sdkClient *ksccdnv1.Cdnv1 } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -67,7 +72,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_DOMAIN: @@ -84,7 +89,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToDomain(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/ksyun-slb/ksyun_slb.go b/pkg/core/deployer/providers/ksyun-slb/ksyun_slb.go index 61ee9335d..bc26bc78f 100644 --- a/pkg/core/deployer/providers/ksyun-slb/ksyun_slb.go +++ b/pkg/core/deployer/providers/ksyun-slb/ksyun_slb.go @@ -9,7 +9,12 @@ import ( "github.com/KscSDK/ksc-sdk-go/ksc" ksckcm "github.com/KscSDK/ksc-sdk-go/service/kcm" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -30,7 +35,7 @@ type Deployer struct { sdkClient *ksckcm.Kcm } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -57,7 +62,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -69,7 +74,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/lecdn/lecdn.go b/pkg/core/deployer/providers/lecdn/lecdn.go index ad2652f85..2ad30bbc8 100644 --- a/pkg/core/deployer/providers/lecdn/lecdn.go +++ b/pkg/core/deployer/providers/lecdn/lecdn.go @@ -7,11 +7,16 @@ import ( "log/slog" "time" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" leclientsdkv3 "github.com/certimate-go/certimate/pkg/sdk3rd/lecdn/v3/client" lemastersdkv3 "github.com/certimate-go/certimate/pkg/sdk3rd/lecdn/v3/master" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // LeCDN 服务地址。 ServerUrl string `json:"serverUrl"` @@ -43,7 +48,7 @@ type Deployer struct { sdkClient any } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -70,7 +75,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -82,7 +87,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/local/local.go b/pkg/core/deployer/providers/local/local.go index 71e8a2f8a..fd133c3c4 100644 --- a/pkg/core/deployer/providers/local/local.go +++ b/pkg/core/deployer/providers/local/local.go @@ -9,12 +9,17 @@ import ( "runtime" "strings" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xcertpfx "github.com/certimate-go/certimate/pkg/utils/cert/pfx" xfile "github.com/certimate-go/certimate/pkg/utils/file" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Shell 执行环境。 // 零值时根据操作系统决定。 @@ -57,7 +62,7 @@ type Deployer struct { logger *slog.Logger } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -78,7 +83,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -211,7 +216,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func execCommand(shellEnv string, command string) (string, string, error) { diff --git a/pkg/core/deployer/providers/mohua-mvh/mohua_mvh.go b/pkg/core/deployer/providers/mohua-mvh/mohua_mvh.go index 24ce007d6..974418c06 100644 --- a/pkg/core/deployer/providers/mohua-mvh/mohua_mvh.go +++ b/pkg/core/deployer/providers/mohua-mvh/mohua_mvh.go @@ -9,7 +9,12 @@ import ( mohuasdk "github.com/mohuatech/mohuacloud-go-sdk" mohuasdktypes "github.com/mohuatech/mohuacloud-go-sdk/types" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -29,7 +34,7 @@ type Deployer struct { sdkClient *mohuasdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -56,7 +61,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.HostId == "" { return nil, fmt.Errorf("config `hostId` is required") } @@ -87,7 +92,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'mvh.SetSSL': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(username, apiPassword string) (*mohuasdk.Client, error) { diff --git a/pkg/core/deployer/providers/netlify/netlify.go b/pkg/core/deployer/providers/netlify/netlify.go index 54899392b..380a3e23e 100644 --- a/pkg/core/deployer/providers/netlify/netlify.go +++ b/pkg/core/deployer/providers/netlify/netlify.go @@ -5,11 +5,16 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" netlifysdk "github.com/certimate-go/certimate/pkg/sdk3rd/netlify" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // netlify API Token。 ApiToken string `json:"apiToken"` @@ -26,7 +31,7 @@ type Deployer struct { sdkClient *netlifysdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -53,7 +58,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_WEBSITE: @@ -65,7 +70,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToWebsite(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go index 2ded08c84..b92e3e07f 100644 --- a/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go +++ b/pkg/core/deployer/providers/nginxproxymanager/nginxproxymanager.go @@ -11,14 +11,18 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/nginxproxymanager" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/nginxproxymanager" npmsdk "github.com/certimate-go/certimate/pkg/sdk3rd/nginxproxymanager" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // NPM 服务地址。 ServerUrl string `json:"serverUrl"` @@ -54,10 +58,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *npmsdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -69,7 +73,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ ServerUrl: config.ServerUrl, AuthMethod: config.AuthMethod, Username: config.Username, @@ -99,7 +103,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_HOST: @@ -116,7 +120,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToHost(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/proxmoxve/proxmoxve.go b/pkg/core/deployer/providers/proxmoxve/proxmoxve.go index c23f86bb6..b3315b076 100644 --- a/pkg/core/deployer/providers/proxmoxve/proxmoxve.go +++ b/pkg/core/deployer/providers/proxmoxve/proxmoxve.go @@ -11,10 +11,15 @@ import ( "github.com/luthermonson/go-proxmox" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" xhttp "github.com/certimate-go/certimate/pkg/utils/http" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Proxmox VE 服务地址。 ServerUrl string `json:"serverUrl"` @@ -36,7 +41,7 @@ type Deployer struct { sdkClient *proxmox.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -63,7 +68,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.NodeName == "" { return nil, fmt.Errorf("config `nodeName` is required") } @@ -87,7 +92,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to upload custom certificate to node '%s': %w", node.Name, err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(serverUrl, apiToken, apiTokenSecret string, skipTlsVerify bool) (*proxmox.Client, error) { diff --git a/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go b/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go index be7579cf4..55a88dd28 100644 --- a/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go +++ b/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go @@ -10,13 +10,17 @@ import ( "github.com/qiniu/go-sdk/v7/auth" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" qiniusdk "github.com/certimate-go/certimate/pkg/sdk3rd/qiniu" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 七牛云 AccessKey。 AccessKey string `json:"accessKey"` @@ -33,10 +37,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *qiniusdk.CdnManager - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -45,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client := qiniusdk.NewCdnManager(auth.New(config.AccessKey, config.SecretKey)) - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) @@ -71,7 +75,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -159,7 +163,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go b/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go index 7142b88c0..6f09d35be 100644 --- a/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go +++ b/pkg/core/deployer/providers/qiniu-kodo/qiniu_kodo.go @@ -7,12 +7,16 @@ import ( "github.com/qiniu/go-sdk/v7/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" qiniusdk "github.com/certimate-go/certimate/pkg/sdk3rd/qiniu" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 七牛云 AccessKey。 AccessKey string `json:"accessKey"` @@ -28,10 +32,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *qiniusdk.KodoManager - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -40,7 +44,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client := qiniusdk.NewKodoManager(auth.New(config.AccessKey, config.SecretKey)) - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) @@ -66,7 +70,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Domain == "" { return nil, fmt.Errorf("config `domain` is required") } @@ -86,5 +90,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'kodo.BindCert': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go b/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go index 9778b03f7..f927a55a5 100644 --- a/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go +++ b/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go @@ -9,12 +9,16 @@ import ( "github.com/qiniu/go-sdk/v7/pili" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/qiniu-sslcert" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 七牛云 AccessKey。 AccessKey string `json:"accessKey"` @@ -33,10 +37,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *pili.Manager - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -45,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { manager := pili.NewManager(pili.ManagerConfig{AccessKey: config.AccessKey, SecretKey: config.SecretKey}) - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKey: config.AccessKey, SecretKey: config.SecretKey, }) @@ -71,7 +75,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Domain == "" { return nil, fmt.Errorf("config `domain` is required") } @@ -138,7 +142,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomainsByHub(ctx context.Context, hub string) ([]string, error) { diff --git a/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go b/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go index 314f772c0..6c61d9c90 100644 --- a/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go +++ b/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go @@ -6,12 +6,16 @@ import ( "log/slog" "strconv" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter" rainyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/rainyun" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 雨云 API 密钥。 ApiKey string `json:"apiKey"` @@ -28,10 +32,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *rainyunsdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -43,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ ApiKey: config.ApiKey, }) if err != nil { @@ -68,7 +72,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.InstanceId == 0 { return nil, fmt.Errorf("config `instanceId` is required") } @@ -97,7 +101,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'rcdn.InstanceSslBind': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(apiKey string) (*rainyunsdk.Client, error) { diff --git a/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go b/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go index 25aabe786..f16612e73 100644 --- a/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go +++ b/pkg/core/deployer/providers/rainyun-sslcenter/rainyun_sslcenter.go @@ -6,9 +6,13 @@ import ( "log/slog" "strconv" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/rainyun-sslcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -22,17 +26,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ ApiKey: config.ApiKey, }) if err != nil { @@ -56,7 +60,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.CertificateId == 0 { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) @@ -75,5 +79,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go b/pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go index 2416af81a..6ccacc99f 100644 --- a/pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go +++ b/pkg/core/deployer/providers/ratpanel-console/ratpanel_console.go @@ -6,10 +6,15 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" ratpanelsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ratpanel" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 耗子面板服务地址。 ServerUrl string `json:"serverUrl"` @@ -27,7 +32,7 @@ type Deployer struct { sdkClient *ratpanelsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 设置面板 SSL 证书 setSettingCertReq := &ratpanelsdk.SetSettingCertRequest{ Certificate: certPEM, @@ -66,7 +71,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'SetSettingCert': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(serverUrl string, accessTokenId int64, accessToken string, skipTlsVerify bool) (*ratpanelsdk.Client, error) { diff --git a/pkg/core/deployer/providers/ratpanel/ratpanel.go b/pkg/core/deployer/providers/ratpanel/ratpanel.go index 29a1daafa..95deae042 100644 --- a/pkg/core/deployer/providers/ratpanel/ratpanel.go +++ b/pkg/core/deployer/providers/ratpanel/ratpanel.go @@ -7,11 +7,16 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" ratpanelsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ratpanel" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 耗子面板服务地址。 ServerUrl string `json:"serverUrl"` @@ -37,7 +42,7 @@ type Deployer struct { sdkClient *ratpanelsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -64,7 +69,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_WEBSITE: @@ -81,7 +86,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToWebsite(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/s3/s3.go b/pkg/core/deployer/providers/s3/s3.go index df7d3f3ad..2417f70d7 100644 --- a/pkg/core/deployer/providers/s3/s3.go +++ b/pkg/core/deployer/providers/s3/s3.go @@ -6,11 +6,16 @@ import ( "log/slog" "github.com/certimate-go/certimate/internal/tools/s3" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xcertpfx "github.com/certimate-go/certimate/pkg/utils/cert/pfx" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // S3 Endpoint。 Endpoint string `json:"endpoint"` @@ -64,7 +69,7 @@ type Deployer struct { logger *slog.Logger } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -85,7 +90,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -186,7 +191,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported file format '%s'", d.config.FileFormat) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createS3Client(config DeployerConfig) (*s3.Client, error) { diff --git a/pkg/core/deployer/providers/safeline/safeline.go b/pkg/core/deployer/providers/safeline/safeline.go index 43d2137b5..959df4fca 100644 --- a/pkg/core/deployer/providers/safeline/safeline.go +++ b/pkg/core/deployer/providers/safeline/safeline.go @@ -6,10 +6,15 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" safelinesdk "github.com/certimate-go/certimate/pkg/sdk3rd/safeline" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 雷池服务地址。 ServerUrl string `json:"serverUrl"` @@ -30,7 +35,7 @@ type Deployer struct { sdkClient *safelinesdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -57,7 +62,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程`` switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -69,7 +74,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/samwaf/samwaf.go b/pkg/core/deployer/providers/samwaf/samwaf.go index b31691f76..87da75482 100644 --- a/pkg/core/deployer/providers/samwaf/samwaf.go +++ b/pkg/core/deployer/providers/samwaf/samwaf.go @@ -6,10 +6,15 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" samwafsdk "github.com/certimate-go/certimate/pkg/sdk3rd/samwaf" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // SamWAF 服务地址。 ServerUrl string `json:"serverUrl"` @@ -30,7 +35,7 @@ type Deployer struct { sdkClient *samwafsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -57,7 +62,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程`` switch d.config.DeployTarget { case DEPLOY_TARGET_CERTIFICATE: @@ -69,7 +74,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToCertificate(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/ssh/ssh.go b/pkg/core/deployer/providers/ssh/ssh.go index fa8635ca4..f1ca5a538 100644 --- a/pkg/core/deployer/providers/ssh/ssh.go +++ b/pkg/core/deployer/providers/ssh/ssh.go @@ -7,12 +7,17 @@ import ( "strings" "github.com/certimate-go/certimate/internal/tools/ssh" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xcertpfx "github.com/certimate-go/certimate/pkg/utils/cert/pfx" xssh "github.com/certimate-go/certimate/pkg/utils/ssh" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type ServerConfig struct { // SSH 主机。 SshHost string `json:"sshHost"` @@ -79,7 +84,7 @@ type Deployer struct { logger *slog.Logger } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -100,7 +105,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -241,7 +246,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSshClient(config DeployerConfig) (*ssh.Client, error) { diff --git a/pkg/core/deployer/providers/synologydsm/synologydsm.go b/pkg/core/deployer/providers/synologydsm/synologydsm.go index a86a8b4d9..ab1906ac5 100644 --- a/pkg/core/deployer/providers/synologydsm/synologydsm.go +++ b/pkg/core/deployer/providers/synologydsm/synologydsm.go @@ -10,12 +10,17 @@ import ( "github.com/pquerna/otp/totp" "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" dsmsdk "github.com/certimate-go/certimate/pkg/sdk3rd/synologydsm" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 群晖 DSM 服务地址。 ServerUrl string `json:"serverUrl"` @@ -40,7 +45,7 @@ type Deployer struct { sdkClient *dsmsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -67,7 +72,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*DeployResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediateCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -214,7 +219,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM string, privkeyPEM string } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(serverUrl string, skipTlsVerify bool) (*dsmsdk.Client, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go b/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go index 69b234b74..a9376badc 100644 --- a/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go +++ b/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go @@ -11,13 +11,18 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tccdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -38,10 +43,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tccdn.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -53,7 +58,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -83,7 +88,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -159,7 +164,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getMatchedDomainsByWildcard(ctx context.Context, wildcardDomain string) ([]string, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go index 67a6d9da6..0ed15b70b 100644 --- a/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go +++ b/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go @@ -12,13 +12,18 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tcclb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -47,10 +52,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tcclb.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -62,7 +67,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -92,7 +97,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -122,7 +127,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go b/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go index 982e61cc2..b5ec317da 100644 --- a/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go +++ b/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go @@ -10,13 +10,18 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tcssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -36,10 +41,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *wSDKClients - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) type wSDKClients struct { SSL *tcssl.Client @@ -55,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -82,7 +87,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Bucket == "" { return nil, fmt.Errorf("config `bucket` is required") } @@ -101,7 +106,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep // 避免多次部署，否则会报错 https://github.com/certimate-go/certimate/issues/897#issuecomment-3182904098 if bind, _ := d.checkIsBind(ctx, upres.CertId); bind { d.logger.Info("ssl certificate already deployed") - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } // 证书部署到 COS 实例 @@ -152,7 +157,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, err } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) checkIsBind(ctx context.Context, cloudCertId string) (bool, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go b/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go index 1d7999218..3d8c8b447 100644 --- a/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go +++ b/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go @@ -10,13 +10,18 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tclive "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -37,10 +42,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tclive.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -52,7 +57,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -82,7 +87,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -138,7 +143,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'live.ModifyLiveDomainCertBindings': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go b/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go index fc06f8260..b844a286f 100644 --- a/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go +++ b/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go @@ -11,13 +11,18 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tccdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -38,10 +43,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tccdn.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -53,7 +58,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -83,7 +88,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -159,7 +164,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getMatchedDomainsByWildcard(ctx context.Context, wildcardDomain string) ([]string, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go index 598bff2a9..86f78ba9c 100644 --- a/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go +++ b/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go @@ -13,15 +13,20 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tceo "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" xcertkey "github.com/certimate-go/certimate/pkg/utils/cert/key" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -46,10 +51,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tceo.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -61,7 +66,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -91,7 +96,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.ZoneId == "" { return nil, fmt.Errorf("config `zoneId` is required") } @@ -265,7 +270,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomainsInZone(ctx context.Context, zoneId string) ([]*tceo.AccelerationDomain, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go index 245a87084..f4d0ee3b3 100644 --- a/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go +++ b/pkg/core/deployer/providers/tencentcloud-gaap/tencentcloud_gaap.go @@ -10,10 +10,15 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tcgaap "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -39,10 +44,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tcgaap.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -84,7 +89,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -104,7 +109,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToListener(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go b/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go index e9104ed5b..d9ed258cb 100644 --- a/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go +++ b/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go @@ -11,13 +11,18 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tcscf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -40,10 +45,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tcscf.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -55,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -85,7 +90,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -148,7 +153,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go b/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go index a0338e5c3..7a966c983 100644 --- a/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go +++ b/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go @@ -10,13 +10,18 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tcssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -38,10 +43,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tcssl.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -53,7 +58,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -81,7 +86,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.ResourceProduct == "" { return nil, fmt.Errorf("config `resourceProduct` is required") } @@ -148,7 +153,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, err } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(secretId, secretKey, endpoint, region string) (*tcssl.Client, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go b/pkg/core/deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go index 38bbbd1d2..26b1a0da0 100644 --- a/pkg/core/deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go +++ b/pkg/core/deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go @@ -11,13 +11,18 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tcssl "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 腾讯云 SecretId。 SecretId string `json:"secretId"` @@ -41,10 +46,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tcssl.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -56,7 +61,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -84,7 +89,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.CertificateId == "" { return nil, fmt.Errorf("config `certificateId` is required") } @@ -102,7 +107,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) executeUpdateCertificateInstance(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go b/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go index c709ac987..b1b57a78a 100644 --- a/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -24,17 +28,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -61,7 +65,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -70,5 +74,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go b/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go index 1dd3ed3f8..3f7b59336 100644 --- a/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go +++ b/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go @@ -11,10 +11,15 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tcvod "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -39,10 +44,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tcvod.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -84,7 +89,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -142,7 +147,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go b/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go index 9a197825e..16569464d 100644 --- a/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go +++ b/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go @@ -10,10 +10,15 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" tcwaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/tencentcloud-ssl" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -39,10 +44,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tcwaf.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -54,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ SecretId: config.SecretId, SecretKey: config.SecretKey, ProjectId: config.ProjectId, @@ -84,7 +89,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.InstanceId == "" { return nil, fmt.Errorf("config `instanceId` is required") } @@ -129,7 +134,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'waf.ModifySpartaProtection': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(secretId, secretKey, endpoint, region string) (*tcwaf.Client, error) { diff --git a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go index 0d893a5f8..8d1ba264a 100644 --- a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go +++ b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go @@ -12,12 +12,16 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ulb" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -44,10 +48,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ucloudsdk.ULBClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -59,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, @@ -87,7 +91,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -112,7 +116,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go b/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go index 71e67b2fe..1d7b86b9e 100644 --- a/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go +++ b/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go @@ -9,12 +9,16 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ucdn" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -30,10 +34,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ucloudsdk.UCDNClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -45,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, @@ -72,7 +76,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.DomainId == "" { return nil, fmt.Errorf("config `domainId` is required") } @@ -114,7 +118,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'ucdn.UpdateUcdnDomainHttpsConfigV2': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(privateKey, publicKey, projectId string) (*ucloudsdk.UCDNClient, error) { diff --git a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go index 22e87f308..f5869b6a4 100644 --- a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go +++ b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go @@ -12,12 +12,16 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ulb" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ulb" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -41,13 +45,13 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ucloudsdk.ULBClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr sslId2PemMap map[string]string sslId2PemMapMu sync.Mutex } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -59,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, @@ -90,7 +94,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -119,7 +123,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf.go b/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf.go index b95e9098f..3abfaa808 100644 --- a/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf.go +++ b/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf.go @@ -12,10 +12,15 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/uewaf" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -33,7 +38,7 @@ type Deployer struct { sdkClient *ucloudsdk.UEWAFClient } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -60,7 +65,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Domain == "" { return nil, fmt.Errorf("config `domain` is required") } @@ -87,7 +92,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'uewaf.AddWafDomainCertificateInfo': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(privateKey, publicKey, projectId string) (*ucloudsdk.UEWAFClient, error) { diff --git a/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go b/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go index c046256f0..920d6938b 100644 --- a/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go +++ b/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go @@ -9,12 +9,16 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-upathx" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-upathx" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/upathx" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -32,10 +36,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ucloudsdk.UPathXClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -47,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, @@ -74,7 +78,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.AcceleratorId == "" { return nil, fmt.Errorf("config `acceleratorId` is required") } @@ -102,7 +106,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'pathx.BindPathXSSL': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(privateKey, publicKey, projectId string) (*ucloudsdk.UPathXClient, error) { diff --git a/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go b/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go index b914829a8..ac87337a8 100644 --- a/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go +++ b/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go @@ -8,12 +8,16 @@ import ( "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/ucloud-ussl" ucloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/ucloud/ufile" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 优刻得 API 私钥。 PrivateKey string `json:"privateKey"` @@ -33,10 +37,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *ucloudsdk.UFileClient - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -48,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ PrivateKey: config.PrivateKey, PublicKey: config.PublicKey, ProjectId: config.ProjectId, @@ -75,7 +79,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Bucket == "" { return nil, fmt.Errorf("config `bucket` is required") } @@ -104,7 +108,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'us3.AddUFileSSLCert': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(privateKey, publicKey, projectId, region string) (*ucloudsdk.UFileClient, error) { diff --git a/pkg/core/deployer/providers/unicloud-webhost/unicloud_webhost.go b/pkg/core/deployer/providers/unicloud-webhost/unicloud_webhost.go index 831735bf4..928db85f4 100644 --- a/pkg/core/deployer/providers/unicloud-webhost/unicloud_webhost.go +++ b/pkg/core/deployer/providers/unicloud-webhost/unicloud_webhost.go @@ -6,10 +6,15 @@ import ( "log/slog" "net/url" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" unicloudsdk "github.com/certimate-go/certimate/pkg/sdk3rd/dcloud/unicloud" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // uniCloud 控制台账号。 Username string `json:"username"` @@ -30,7 +35,7 @@ type Deployer struct { sdkClient *unicloudsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -57,7 +62,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.SpaceProvider == "" { return nil, fmt.Errorf("config `spaceProvider` is required") } @@ -82,7 +87,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'unicloud.host.CreateDomainWithCert': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(username, password string) (*unicloudsdk.Client, error) { diff --git a/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go b/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go index f94d7c25e..e09bf080a 100644 --- a/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go +++ b/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go @@ -9,13 +9,17 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl" upyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/upyun/console" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 又拍云账号用户名。 Username string `json:"username"` @@ -32,10 +36,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *upyunsdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -47,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ Username: config.Username, Password: config.Password, }) @@ -73,7 +77,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -159,7 +163,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/upyun-file/upyun_file.go b/pkg/core/deployer/providers/upyun-file/upyun_file.go index 77062dffe..a34a46e04 100644 --- a/pkg/core/deployer/providers/upyun-file/upyun_file.go +++ b/pkg/core/deployer/providers/upyun-file/upyun_file.go @@ -7,12 +7,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/upyun-ssl" upyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/upyun/console" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 又拍云账号用户名。 Username string `json:"username"` @@ -28,10 +32,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *upyunsdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -43,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ Username: config.Username, Password: config.Password, }) @@ -69,7 +73,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -114,7 +118,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(username, password string) (*upyunsdk.Client, error) { diff --git a/pkg/core/deployer/providers/vercel/vercel.go b/pkg/core/deployer/providers/vercel/vercel.go index 2c46a480d..2474c3bcc 100644 --- a/pkg/core/deployer/providers/vercel/vercel.go +++ b/pkg/core/deployer/providers/vercel/vercel.go @@ -5,11 +5,16 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" vercelsdk "github.com/certimate-go/certimate/pkg/sdk3rd/vercel" xcert "github.com/certimate-go/certimate/pkg/utils/cert" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Vercel API AccessToken。 ApiAccessToken string `json:"apiAccessToken"` @@ -23,7 +28,7 @@ type Deployer struct { sdkClient *vercelsdk.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -50,7 +55,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 提取服务器证书和中间证书 serverCertPEM, intermediaCertPEM, err := xcert.ExtractCertificatesFromPEM(certPEM) if err != nil { @@ -71,7 +76,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'UploadCert': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(apiToken, teamId string) (*vercelsdk.Client, error) { diff --git a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go index 3632aca2a..e72f8913a 100644 --- a/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go +++ b/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go @@ -10,10 +10,15 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" vealb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/alb" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -42,10 +47,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *vealb.ALB - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -57,7 +62,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -85,7 +90,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -110,7 +115,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go index 1b3ece0b5..716883169 100644 --- a/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go +++ b/pkg/core/deployer/providers/volcengine-apig/volcengine_apig.go @@ -10,13 +10,18 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" veapig "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/apig" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -37,10 +42,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *veapig.APIG - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -52,7 +57,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -80,7 +85,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -183,7 +188,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]*veapig.ItemForListCustomDomainsOutput, error) { diff --git a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go index 677a89e56..3f8797955 100644 --- a/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go +++ b/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go @@ -11,13 +11,18 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-cdn" - "github.com/certimate-go/certimate/pkg/core/deployer" vecdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/cdn" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-cdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -36,10 +41,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *vecdn.CDN - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -51,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -78,7 +83,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -154,7 +159,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getMatchedDomainsByWildcard(ctx context.Context, wildcardDomain string) ([]string, error) { diff --git a/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go b/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go index 282366606..6673229b4 100644 --- a/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go @@ -5,9 +5,13 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -24,17 +28,17 @@ type DeployerConfig struct { type Deployer struct { config *DeployerConfig logger *slog.Logger - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { return nil, fmt.Errorf("the configuration of the deployer provider is nil") } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -61,7 +65,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -70,5 +74,5 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } diff --git a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go index 96b8a6e74..2e44a03cc 100644 --- a/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go +++ b/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go @@ -9,10 +9,15 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" veclb "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/clb" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -38,10 +43,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *veclb.CLB - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -53,7 +58,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -81,7 +86,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -106,7 +111,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go index bf16f66cf..63455f2e9 100644 --- a/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go +++ b/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go @@ -10,13 +10,18 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" vedcdn "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/dcdn" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -37,10 +42,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *vedcdn.DCDN - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -52,7 +57,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -80,7 +85,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -158,7 +163,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'dcdn.CreateCertBind': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go index bd86b5031..396192b98 100644 --- a/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go +++ b/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go @@ -8,9 +8,13 @@ import ( vebase "github.com/volcengine/volc-sdk-golang/base" veimagex "github.com/volcengine/volc-sdk-golang/service/imagex/v2" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -32,10 +36,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *veimagex.Imagex - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -47,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -75,7 +79,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.ServiceId == "" { return nil, fmt.Errorf("config `serviceId` is required") } @@ -132,7 +136,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'imagex.UpdateHttps': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey, region string) (*veimagex.Imagex, error) { diff --git a/pkg/core/deployer/providers/volcengine-live/volcengine_live.go b/pkg/core/deployer/providers/volcengine-live/volcengine_live.go index e2a34bd14..7ea3f969a 100644 --- a/pkg/core/deployer/providers/volcengine-live/volcengine_live.go +++ b/pkg/core/deployer/providers/volcengine-live/volcengine_live.go @@ -11,12 +11,16 @@ import ( velive "github.com/volcengine/volc-sdk-golang/service/live/v20230101" ve "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-live" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-live" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -35,10 +39,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *velive.Live - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -49,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client.SetAccessKey(config.AccessKeyId) client.SetSecretKey(config.SecretAccessKey) - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -76,7 +80,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -162,7 +166,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go index 17474a3ad..6b3a30a70 100644 --- a/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go +++ b/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go @@ -7,9 +7,13 @@ import ( "github.com/volcengine/ve-tos-golang-sdk/v2/tos" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -31,10 +35,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *tos.ClientV2 - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -46,7 +50,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -74,7 +78,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Bucket == "" { return nil, fmt.Errorf("config `bucket` is required") } @@ -105,7 +109,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'tos.PutBucketCustomDomain': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, secretAccessKey, region string) (*tos.ClientV2, error) { diff --git a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go index 52c115339..ff963051d 100644 --- a/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go +++ b/pkg/core/deployer/providers/volcengine-vod/volcengine_vod.go @@ -12,13 +12,18 @@ import ( vevodreq "github.com/volcengine/volc-sdk-golang/service/vod/models/request" ve "github.com/volcengine/volcengine-go-sdk/volcengine" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" vevod "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volc-sdk-golang/service/vod" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 火山引擎 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -41,10 +46,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *vevod.Vod - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -55,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { client.SetAccessKey(config.AccessKeyId) client.SetSecretKey(config.SecretAccessKey) - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -82,7 +87,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -168,7 +173,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) getAllDomains(ctx context.Context) ([]string, error) { diff --git a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go index 24b32888f..05683109c 100644 --- a/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go +++ b/pkg/core/deployer/providers/volcengine-waf/volcengine_waf.go @@ -10,10 +10,15 @@ import ( ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" - "github.com/certimate-go/certimate/pkg/core/deployer" vewaf "github.com/certimate-go/certimate/pkg/sdk3rd-trimmed/github.com/volcengine/volcengine-go-sdk/service/waf" + + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/volcengine-certcenter" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult ) type DeployerConfig struct { @@ -35,10 +40,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *vewaf.WAF - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -50,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, SecretAccessKey: config.SecretAccessKey, ProjectName: config.ProjectName, @@ -78,7 +83,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -98,7 +103,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported access mode '%s'", d.config.AccessMode) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployWithCNAME(ctx context.Context, cloudCertId string) error { diff --git a/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go b/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go index a619b4adf..bc75ef2ef 100644 --- a/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go +++ b/pkg/core/deployer/providers/wangsu-cdn/wangsu_cdn.go @@ -9,12 +9,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate" wangsusdk "github.com/certimate-go/certimate/pkg/sdk3rd/wangsu/cdn" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 网宿云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -31,10 +35,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *wangsusdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -46,7 +50,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -70,7 +74,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) if err != nil { @@ -111,7 +115,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("failed to execute sdk request 'cdn.BatchUpdateCertificateConfig': %w", err) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret string) (*wangsusdk.Client, error) { diff --git a/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go b/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go index d0091b574..8f1109c18 100644 --- a/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go +++ b/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go @@ -17,11 +17,16 @@ import ( "github.com/samber/lo" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" wangsucdn "github.com/certimate-go/certimate/pkg/sdk3rd/wangsu/cdnpro" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 网宿云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -50,7 +55,7 @@ type Deployer struct { sdkClient *wangsucdn.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -77,7 +82,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.Domain == "" { return nil, fmt.Errorf("config `domain` is required") } @@ -210,7 +215,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, err } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret string) (*wangsucdn.Client, error) { diff --git a/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go b/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go index e8731f209..9c6253f98 100644 --- a/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go +++ b/pkg/core/deployer/providers/wangsu-certificate/wangsu_certificate.go @@ -5,12 +5,16 @@ import ( "fmt" "log/slog" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/wangsu-certificate" wangsusdk "github.com/certimate-go/certimate/pkg/sdk3rd/wangsu/certificate" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // 网宿云 AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -25,10 +29,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *wangsusdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -40,7 +44,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeySecret: config.AccessKeySecret, }) @@ -64,7 +68,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { if d.config.CertificateId == "" { // 上传证书 upres, err := d.sdkCertmgr.Upload(ctx, certPEM, privkeyPEM) @@ -83,7 +87,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep } } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func createSDKClient(accessKeyId, accessKeySecret string) (*wangsusdk.Client, error) { diff --git a/pkg/core/deployer/providers/webhook/webhook.go b/pkg/core/deployer/providers/webhook/webhook.go index 05c951d83..cc3866c4e 100644 --- a/pkg/core/deployer/providers/webhook/webhook.go +++ b/pkg/core/deployer/providers/webhook/webhook.go @@ -13,11 +13,16 @@ import ( "github.com/go-resty/resty/v2" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" xcert "github.com/certimate-go/certimate/pkg/utils/cert" xcertx509 "github.com/certimate-go/certimate/pkg/utils/cert/x509" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Webhook URL。 WebhookUrl string `json:"webhookUrl"` @@ -41,7 +46,7 @@ type Deployer struct { httpClient *resty.Client } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -74,7 +79,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { } } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 解析证书内容 certX509, err := xcert.ParseCertificateFromPEM(certPEM) if err != nil { @@ -200,7 +205,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep d.logger.Debug("webhook responded", slog.Any("response", resp.String())) - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} { diff --git a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go index 0c6206ba2..f73b40608 100644 --- a/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go +++ b/pkg/core/deployer/providers/zenlayer-cdn/zenlayer_cdn.go @@ -10,14 +10,18 @@ import ( "github.com/samber/lo" zcommon "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-cdn" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-cdn" zcdnsdk "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/cdn" xcerthostname "github.com/certimate-go/certimate/pkg/utils/cert/hostname" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Zenlayer AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -44,10 +48,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *zcdnsdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -59,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeyPassword: config.AccessKeyPassword, ResourceGroupId: config.ResourceGroupId, @@ -86,7 +90,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_DOMAIN: @@ -103,7 +107,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToDomain(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go index 1ecd50331..f54d45fba 100644 --- a/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go +++ b/pkg/core/deployer/providers/zenlayer-ga/zenlayer_ga.go @@ -8,13 +8,17 @@ import ( zcommon "github.com/zenlayer/zenlayercloud-sdk-go/zenlayercloud/common" - "github.com/certimate-go/certimate/pkg/core/certmgr" - certmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-ga" - "github.com/certimate-go/certimate/pkg/core/deployer" + "github.com/certimate-go/certimate/pkg/core" + cmgrimpl "github.com/certimate-go/certimate/pkg/core/certmgr/providers/zenlayer-ga" zgasdk "github.com/certimate-go/certimate/pkg/sdk3rd/zenlayer/zga" xwait "github.com/certimate-go/certimate/pkg/utils/wait" ) +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) + type DeployerConfig struct { // Zenlayer AccessKeyId。 AccessKeyId string `json:"accessKeyId"` @@ -36,10 +40,10 @@ type Deployer struct { config *DeployerConfig logger *slog.Logger sdkClient *zgasdk.Client - sdkCertmgr certmgr.Provider + sdkCertmgr core.Certmgr } -var _ deployer.Provider = (*Deployer)(nil) +var _ Provider = (*Deployer)(nil) func NewDeployer(config *DeployerConfig) (*Deployer, error) { if config == nil { @@ -51,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) { return nil, fmt.Errorf("could not create client: %w", err) } - pcertmgr, err := certmgrimpl.NewCertmgr(&certmgrimpl.CertmgrConfig{ + pcertmgr, err := cmgrimpl.NewCertmgr(&cmgrimpl.CertmgrConfig{ AccessKeyId: config.AccessKeyId, AccessKeyPassword: config.AccessKeyPassword, ResourceGroupId: config.ResourceGroupId, @@ -78,7 +82,7 @@ func (d *Deployer) SetLogger(logger *slog.Logger) { d.sdkCertmgr.SetLogger(logger) } -func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*deployer.DeployResult, error) { +func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*DeployResult, error) { // 根据部署目标决定业务流程 switch d.config.DeployTarget { case DEPLOY_TARGET_ACCELERATOR: @@ -95,7 +99,7 @@ func (d *Deployer) Deploy(ctx context.Context, certPEM, privkeyPEM string) (*dep return nil, fmt.Errorf("unsupported deploy target '%s'", d.config.DeployTarget) } - return &deployer.DeployResult{}, nil + return &DeployResult{}, nil } func (d *Deployer) deployToAccelerator(ctx context.Context, certPEM, privkeyPEM string) error { diff --git a/pkg/core/deployer/typealias.go b/pkg/core/deployer/typealias.go new file mode 100644 index 000000000..df59cfa70 --- /dev/null +++ b/pkg/core/deployer/typealias.go @@ -0,0 +1,10 @@ +package deployer + +import ( + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Deployer + DeployResult = core.DeployerDeployResult +) diff --git a/pkg/core/notifier/provider.go b/pkg/core/notifier/provider.go deleted file mode 100644 index 96c884ec0..000000000 --- a/pkg/core/notifier/provider.go +++ /dev/null @@ -1,9 +0,0 @@ -package notifier - -import ( - "github.com/certimate-go/certimate/pkg/core" -) - -type Provider = core.Notifier - -type NotifyResult = core.NotifierNotifyResult diff --git a/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go b/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go index 66afe0c8a..dbab40074 100644 --- a/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go +++ b/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go @@ -16,7 +16,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/certimate-go/certimate/internal/app" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -35,7 +40,7 @@ type Notifier struct { httpClient *resty.Client } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -77,7 +82,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { webhookUrl, err := url.Parse(n.config.WebhookUrl) if err != nil { return nil, fmt.Errorf("dingtalk api error: invalid webhook url: %w", err) @@ -99,7 +104,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( } else { err = json.Unmarshal([]byte(n.config.CustomPayload), &webhookData) if err != nil { - return nil, fmt.Errorf("failed to unmarshal webhook data: %w", err) + return nil, fmt.Errorf("failed to unmarshal custom payload: %w", err) } replaceJsonValueRecursively(webhookData, "${CERTIMATE_NOTIFIER_SUBJECT}", subject) @@ -128,7 +133,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( return nil, fmt.Errorf("dingtalk api error: errcode='%d', errmsg='%s'", result.ErrorCode, result.ErrorMessage) } - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} { diff --git a/pkg/core/notifier/providers/discordbot/discordbot.go b/pkg/core/notifier/providers/discordbot/discordbot.go index 8839dd98a..bf5addc0e 100644 --- a/pkg/core/notifier/providers/discordbot/discordbot.go +++ b/pkg/core/notifier/providers/discordbot/discordbot.go @@ -8,7 +8,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/certimate-go/certimate/internal/app" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -24,7 +29,7 @@ type Notifier struct { httpClient *resty.Client } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -51,7 +56,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { // REF: https://discord.com/developers/docs/resources/message#create-message req := n.httpClient.R(). SetContext(ctx). @@ -65,5 +70,5 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( return nil, fmt.Errorf("discord api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } diff --git a/pkg/core/notifier/providers/email/email.go b/pkg/core/notifier/providers/email/email.go index 4bc21d086..387c73586 100644 --- a/pkg/core/notifier/providers/email/email.go +++ b/pkg/core/notifier/providers/email/email.go @@ -8,7 +8,12 @@ import ( "github.com/microcosm-cc/bluemonday" "github.com/certimate-go/certimate/internal/tools/smtp" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -42,7 +47,7 @@ type Notifier struct { logger *slog.Logger } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -63,7 +68,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { clientCfg := smtp.NewDefaultConfig() clientCfg.Host = n.config.SmtpHost clientCfg.Port = int(n.config.SmtpPort) @@ -101,5 +106,5 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( return nil, fmt.Errorf("failed to send mail: %w", err) } - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } diff --git a/pkg/core/notifier/providers/larkbot/larkbot.go b/pkg/core/notifier/providers/larkbot/larkbot.go index 7de42b8c2..2b5303655 100644 --- a/pkg/core/notifier/providers/larkbot/larkbot.go +++ b/pkg/core/notifier/providers/larkbot/larkbot.go @@ -15,7 +15,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/certimate-go/certimate/internal/app" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -34,7 +39,7 @@ type Notifier struct { httpClient *resty.Client } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -60,7 +65,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { webhookUrl, err := url.Parse(n.config.WebhookUrl) if err != nil { return nil, fmt.Errorf("lark api error: invalid webhook url: %w", err) @@ -83,7 +88,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( } else { err = json.Unmarshal([]byte(n.config.CustomPayload), &webhookData) if err != nil { - return nil, fmt.Errorf("failed to unmarshal webhook data: %w", err) + return nil, fmt.Errorf("failed to unmarshal custom payload: %w", err) } replaceJsonValueRecursively(webhookData, "${CERTIMATE_NOTIFIER_SUBJECT}", subject) @@ -130,7 +135,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( return nil, fmt.Errorf("lark api error: code='%d', msg='%s'", result.Code, result.Message) } - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} { diff --git a/pkg/core/notifier/providers/mattermost/mattermost.go b/pkg/core/notifier/providers/mattermost/mattermost.go index 85c62c97e..e6abaa1c2 100644 --- a/pkg/core/notifier/providers/mattermost/mattermost.go +++ b/pkg/core/notifier/providers/mattermost/mattermost.go @@ -9,7 +9,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/certimate-go/certimate/internal/app" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -29,7 +34,7 @@ type Notifier struct { httpClient *resty.Client } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -55,7 +60,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { serverUrl := strings.TrimSuffix(n.config.ServerUrl, "/") // REF: https://developers.mattermost.com/api-documentation/#/operations/Login @@ -96,5 +101,5 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( return nil, fmt.Errorf("mattermost api error: unexpected status code: %d (resp: %s)", postResp.StatusCode(), postResp.String()) } - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } diff --git a/pkg/core/notifier/providers/slackbot/slackbot.go b/pkg/core/notifier/providers/slackbot/slackbot.go index fda445194..d8462127d 100644 --- a/pkg/core/notifier/providers/slackbot/slackbot.go +++ b/pkg/core/notifier/providers/slackbot/slackbot.go @@ -1,4 +1,4 @@ -package discordbot +package slackbot import ( "context" @@ -8,7 +8,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/certimate-go/certimate/internal/app" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -24,7 +29,7 @@ type Notifier struct { httpClient *resty.Client } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -51,7 +56,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { // REF: https://docs.slack.dev/messaging/sending-and-scheduling-messages#publishing req := n.httpClient.R(). SetContext(ctx). @@ -67,5 +72,5 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( return nil, fmt.Errorf("slack api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } diff --git a/pkg/core/notifier/providers/slackbot/slackbot_test.go b/pkg/core/notifier/providers/slackbot/slackbot_test.go index b2770dbba..c33776e4e 100644 --- a/pkg/core/notifier/providers/slackbot/slackbot_test.go +++ b/pkg/core/notifier/providers/slackbot/slackbot_test.go @@ -1,4 +1,4 @@ -package discordbot_test +package slackbot_test import ( "testing" diff --git a/pkg/core/notifier/providers/telegrambot/telegrambot.go b/pkg/core/notifier/providers/telegrambot/telegrambot.go index c8c9d666c..2da869928 100644 --- a/pkg/core/notifier/providers/telegrambot/telegrambot.go +++ b/pkg/core/notifier/providers/telegrambot/telegrambot.go @@ -8,7 +8,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/certimate-go/certimate/internal/app" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -24,7 +29,7 @@ type Notifier struct { httpClient *resty.Client } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -50,7 +55,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { // REF: https://core.telegram.org/bots/api#sendmessage req := n.httpClient.R(). SetContext(ctx). @@ -65,5 +70,5 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( return nil, fmt.Errorf("telegram api error: unexpected status code: %d (resp: %s)", resp.StatusCode(), resp.String()) } - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } diff --git a/pkg/core/notifier/providers/webhook/webhook.go b/pkg/core/notifier/providers/webhook/webhook.go index 219e519d4..0d5b1aa2e 100644 --- a/pkg/core/notifier/providers/webhook/webhook.go +++ b/pkg/core/notifier/providers/webhook/webhook.go @@ -13,7 +13,12 @@ import ( "github.com/go-resty/resty/v2" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -39,7 +44,7 @@ type Notifier struct { httpClient *resty.Client } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -72,7 +77,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { // 处理 Webhook URL webhookUrl, err := url.Parse(n.config.WebhookUrl) if err != nil { @@ -175,7 +180,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( n.logger.Debug("webhook responded", slog.String("response", resp.String())) - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} { diff --git a/pkg/core/notifier/providers/wecombot/wecombot.go b/pkg/core/notifier/providers/wecombot/wecombot.go index 454dc61e3..4469262c8 100644 --- a/pkg/core/notifier/providers/wecombot/wecombot.go +++ b/pkg/core/notifier/providers/wecombot/wecombot.go @@ -11,7 +11,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/certimate-go/certimate/internal/app" - "github.com/certimate-go/certimate/pkg/core/notifier" + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult ) type NotifierConfig struct { @@ -28,7 +33,7 @@ type Notifier struct { httpClient *resty.Client } -var _ notifier.Provider = (*Notifier)(nil) +var _ Provider = (*Notifier)(nil) func NewNotifier(config *NotifierConfig) (*Notifier, error) { if config == nil { @@ -54,7 +59,7 @@ func (n *Notifier) SetLogger(logger *slog.Logger) { } } -func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { +func (n *Notifier) Notify(ctx context.Context, subject string, message string) (*NotifyResult, error) { webhookUrl, err := url.Parse(n.config.WebhookUrl) if err != nil { return nil, fmt.Errorf("dingtalk api error: invalid webhook url: %w", err) @@ -76,7 +81,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( } else { err = json.Unmarshal([]byte(n.config.CustomPayload), &webhookData) if err != nil { - return nil, fmt.Errorf("failed to unmarshal webhook data: %w", err) + return nil, fmt.Errorf("failed to unmarshal custom payload: %w", err) } replaceJsonValueRecursively(webhookData, "${CERTIMATE_NOTIFIER_SUBJECT}", subject) @@ -105,7 +110,7 @@ func (n *Notifier) Notify(ctx context.Context, subject string, message string) ( return nil, fmt.Errorf("wecom api error: errcode='%d', errmsg='%s'", result.ErrorCode, result.ErrorMessage) } - return ¬ifier.NotifyResult{}, nil + return &NotifyResult{}, nil } func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} { diff --git a/pkg/core/notifier/typealias.go b/pkg/core/notifier/typealias.go new file mode 100644 index 000000000..29955ef3f --- /dev/null +++ b/pkg/core/notifier/typealias.go @@ -0,0 +1,10 @@ +package notifier + +import ( + "github.com/certimate-go/certimate/pkg/core" +) + +type ( + Provider = core.Notifier + NotifyResult = core.NotifierNotifyResult +)