wood/certimate
1
0
Fork 0
mirror of https://github.com/woodchen-ink/certimate.git synced 2025-07-18 17:31:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: modify directory structure

Browse Source
This commit is contained in:
Fu Diwei 2025-06-17 14:01:34 +08:00
parent 299a722aa9
commit 30840bbba5
346 changed files with 5051 additions and 5086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
internal/applicant/providers.go
View File

@ -6,44 +6,44 @@ import (
"github.com/go-acme/lego/v4/challenge" "github.com/go-acme/lego/v4/challenge"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
pACMEHttpReq "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/acmehttpreq" pACMEHttpReq "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/acmehttpreq"
pAliyun "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/aliyun" pAliyun "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/aliyun"
pAliyunESA "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/aliyun-esa" pAliyunESA "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/aliyun-esa"
pAWSRoute53 "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/aws-route53" pAWSRoute53 "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/aws-route53"
pAzureDNS "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/azure-dns" pAzureDNS "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/azure-dns"
pBaiduCloud "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/baiducloud" pBaiduCloud "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/baiducloud"
pBunny "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/bunny" pBunny "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/bunny"
pCloudflare "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/cloudflare" pCloudflare "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/cloudflare"
pClouDNS "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/cloudns" pClouDNS "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/cloudns"
pCMCCCloud "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/cmcccloud" pCMCCCloud "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/cmcccloud"
pConstellix "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/constellix" pConstellix "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/constellix"
pCTCCCloud "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/ctcccloud" pCTCCCloud "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/ctcccloud"
pDeSEC "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/desec" pDeSEC "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/desec"
pDigitalOcean "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/digitalocean" pDigitalOcean "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/digitalocean"
pDNSLA "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/dnsla" pDNSLA "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/dnsla"
pDuckDNS "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/duckdns" pDuckDNS "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/duckdns"
pDynv6 "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/dynv6" pDynv6 "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/dynv6"
pGcore "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/gcore" pGcore "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/gcore"
pGname "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/gname" pGname "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/gname"
pGoDaddy "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/godaddy" pGoDaddy "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/godaddy"
pHetzner "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/hetzner" pHetzner "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/hetzner"
pHuaweiCloud "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/huaweicloud" pHuaweiCloud "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/huaweicloud"
pJDCloud "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/jdcloud" pJDCloud "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/jdcloud"
pNamecheap "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/namecheap" pNamecheap "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/namecheap"
pNameDotCom "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/namedotcom" pNameDotCom "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/namedotcom"
pNameSilo "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/namesilo" pNameSilo "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/namesilo"
pNetcup "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/netcup" pNetcup "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/netcup"
pNetlify "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/netlify" pNetlify "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/netlify"
pNS1 "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/ns1" pNS1 "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/ns1"
pPorkbun "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/porkbun" pPorkbun "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/porkbun"
pPowerDNS "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/powerdns" pPowerDNS "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/powerdns"
pRainYun "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/rainyun" pRainYun "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/rainyun"
pTencentCloud "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/tencentcloud" pTencentCloud "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/tencentcloud"
pTencentCloudEO "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/tencentcloud-eo" pTencentCloudEO "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/tencentcloud-eo"
pUCloudUDNR "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/ucloud-udnr" pUCloudUDNR "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/ucloud-udnr"
pVercel "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/vercel" pVercel "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/vercel"
pVolcEngine "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/volcengine" pVolcEngine "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/volcengine"
pWestcn "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/westcn" pWestcn "github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/westcn"
xmaps "github.com/usual2970/certimate/internal/pkg/utils/maps" xmaps "github.com/usual2970/certimate/internal/pkg/utils/maps"
) )

10
internal/deployer/deployer.go
View File

@ -6,7 +6,7 @@ import (
"log/slog" "log/slog"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/repository" "github.com/usual2970/certimate/internal/repository"
) )
@ -46,20 +46,22 @@ func NewWithWorkflowNode(config DeployerWithWorkflowNodeConfig) (Deployer, error
} }
} }
deployerProvider, err := createDeployerProvider(options) deployer, err := createSSLDeployerProvider(options)
if err != nil { if err != nil {
return nil, err return nil, err
} else {
deployer.SetLogger(config.Logger)
} }
return &deployerImpl{ return &deployerImpl{
provider: deployerProvider.WithLogger(config.Logger), provider: deployer,
certPEM: config.CertificatePEM, certPEM: config.CertificatePEM,
privkeyPEM: config.PrivateKeyPEM, privkeyPEM: config.PrivateKeyPEM,
}, nil }, nil
} }
type deployerImpl struct { type deployerImpl struct {
provider deployer.Deployer provider core.SSLDeployer
certPEM string certPEM string
privkeyPEM string privkeyPEM string
} }

384
internal/deployer/providers.go
View File

@ -6,102 +6,102 @@ import (
"strings" "strings"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core"
p1PanelConsole "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/1panel-console" p1PanelConsole "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/1panel-console"
p1PanelSite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/1panel-site" p1PanelSite "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/1panel-site"
pAliyunALB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-alb" pAliyunALB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-alb"
pAliyunAPIGW "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-apigw" pAliyunAPIGW "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-apigw"
pAliyunCAS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-cas" pAliyunCAS "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-cas"
pAliyunCASDeploy "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-cas-deploy" pAliyunCASDeploy "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-cas-deploy"
pAliyunCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-cdn" pAliyunCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-cdn"
pAliyunCLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-clb" pAliyunCLB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-clb"
pAliyunDCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-dcdn" pAliyunDCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-dcdn"
pAliyunDDoS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-ddos" pAliyunDDoS "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-ddos"
pAliyunESA "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-esa" pAliyunESA "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-esa"
pAliyunFC "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-fc" pAliyunFC "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-fc"
pAliyunGA "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-ga" pAliyunGA "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-ga"
pAliyunLive "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-live" pAliyunLive "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-live"
pAliyunNLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-nlb" pAliyunNLB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-nlb"
pAliyunOSS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-oss" pAliyunOSS "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-oss"
pAliyunVOD "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-vod" pAliyunVOD "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-vod"
pAliyunWAF "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-waf" pAliyunWAF "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-waf"
pAPISIX "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/apisix" pAPISIX "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/apisix"
pAWSACM "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aws-acm" pAWSACM "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aws-acm"
pAWSCloudFront "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aws-cloudfront" pAWSCloudFront "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aws-cloudfront"
pAWSIAM "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aws-iam" pAWSIAM "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aws-iam"
pAzureKeyVault "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/azure-keyvault" pAzureKeyVault "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/azure-keyvault"
pBaiduCloudAppBLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-appblb" pBaiduCloudAppBLB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baiducloud-appblb"
pBaiduCloudBLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-blb" pBaiduCloudBLB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baiducloud-blb"
pBaiduCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-cdn" pBaiduCloudCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baiducloud-cdn"
pBaiduCloudCert "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-cert" pBaiduCloudCert "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baiducloud-cert"
pBaishanCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baishan-cdn" pBaishanCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baishan-cdn"
pBaotaPanelConsole "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotapanel-console" pBaotaPanelConsole "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baotapanel-console"
pBaotaPanelSite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotapanel-site" pBaotaPanelSite "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baotapanel-site"
pBaotaWAFConsole "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotawaf-console" pBaotaWAFConsole "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baotawaf-console"
pBaotaWAFSite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baotawaf-site" pBaotaWAFSite "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/baotawaf-site"
pBunnyCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/bunny-cdn" pBunnyCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/bunny-cdn"
pBytePlusCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/byteplus-cdn" pBytePlusCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/byteplus-cdn"
pCacheFly "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/cachefly" pCacheFly "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/cachefly"
pCdnfly "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/cdnfly" pCdnfly "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/cdnfly"
pCTCCCloudAO "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ctcccloud-ao" pCTCCCloudAO "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ctcccloud-ao"
pCTCCCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ctcccloud-cdn" pCTCCCloudCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ctcccloud-cdn"
pCTCCCloudCMS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ctcccloud-cms" pCTCCCloudCMS "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ctcccloud-cms"
pCTCCCloudELB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ctcccloud-elb" pCTCCCloudELB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ctcccloud-elb"
pCTCCCloudICDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ctcccloud-icdn" pCTCCCloudICDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ctcccloud-icdn"
pCTCCCloudLVDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ctcccloud-lvdn" pCTCCCloudLVDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ctcccloud-lvdn"
pDogeCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/dogecloud-cdn" pDogeCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/dogecloud-cdn"
pEdgioApplications "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/edgio-applications" pEdgioApplications "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/edgio-applications"
pFlexCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/flexcdn" pFlexCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/flexcdn"
pGcoreCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/gcore-cdn" pGcoreCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/gcore-cdn"
pGoEdge "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/goedge" pGoEdge "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/goedge"
pHuaweiCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/huaweicloud-cdn" pHuaweiCloudCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/huaweicloud-cdn"
pHuaweiCloudELB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/huaweicloud-elb" pHuaweiCloudELB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/huaweicloud-elb"
pHuaweiCloudSCM "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/huaweicloud-scm" pHuaweiCloudSCM "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/huaweicloud-scm"
pHuaweiCloudWAF "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/huaweicloud-waf" pHuaweiCloudWAF "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/huaweicloud-waf"
pJDCloudALB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-alb" pJDCloudALB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/jdcloud-alb"
pJDCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-cdn" pJDCloudCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/jdcloud-cdn"
pJDCloudLive "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-live" pJDCloudLive "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/jdcloud-live"
pJDCloudVOD "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/jdcloud-vod" pJDCloudVOD "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/jdcloud-vod"
pK8sSecret "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/k8s-secret" pK8sSecret "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/k8s-secret"
pLeCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/lecdn" pLeCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/lecdn"
pLocal "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/local" pLocal "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/local"
pNetlifySite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/netlify-site" pNetlifySite "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/netlify-site"
pProxmoxVE "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/proxmoxve" pProxmoxVE "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/proxmoxve"
pQiniuCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/qiniu-cdn" pQiniuCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/qiniu-cdn"
pQiniuPili "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/qiniu-pili" pQiniuPili "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/qiniu-pili"
pRainYunRCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/rainyun-rcdn" pRainYunRCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/rainyun-rcdn"
pRatPanelConsole "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ratpanel-console" pRatPanelConsole "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ratpanel-console"
pRatPanelSite "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ratpanel-site" pRatPanelSite "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ratpanel-site"
pSafeLine "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/safeline" pSafeLine "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/safeline"
pSSH "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ssh" pSSH "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ssh"
pTencentCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-cdn" pTencentCloudCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-cdn"
pTencentCloudCLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-clb" pTencentCloudCLB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-clb"
pTencentCloudCOS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-cos" pTencentCloudCOS "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-cos"
pTencentCloudCSS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-css" pTencentCloudCSS "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-css"
pTencentCloudECDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-ecdn" pTencentCloudECDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-ecdn"
pTencentCloudEO "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-eo" pTencentCloudEO "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-eo"
pTencentCloudGAAP "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-gaap" pTencentCloudGAAP "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-gaap"
pTencentCloudSCF "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-scf" pTencentCloudSCF "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-scf"
pTencentCloudSSL "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-ssl" pTencentCloudSSL "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-ssl"
pTencentCloudSSLDeploy "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy" pTencentCloudSSLDeploy "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-ssl-deploy"
pTencentCloudVOD "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-vod" pTencentCloudVOD "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-vod"
pTencentCloudWAF "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-waf" pTencentCloudWAF "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/tencentcloud-waf"
pUCloudUCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ucloud-ucdn" pUCloudUCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ucloud-ucdn"
pUCloudUS3 "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ucloud-us3" pUCloudUS3 "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/ucloud-us3"
pUniCloudWebHost "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/unicloud-webhost" pUniCloudWebHost "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/unicloud-webhost"
pUpyunCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/upyun-cdn" pUpyunCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/upyun-cdn"
pVolcEngineALB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-alb" pVolcEngineALB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/volcengine-alb"
pVolcEngineCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-cdn" pVolcEngineCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/volcengine-cdn"
pVolcEngineCertCenter "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-certcenter" pVolcEngineCertCenter "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/volcengine-certcenter"
pVolcEngineCLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-clb" pVolcEngineCLB "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/volcengine-clb"
pVolcEngineDCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-dcdn" pVolcEngineDCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/volcengine-dcdn"
pVolcEngineImageX "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-imagex" pVolcEngineImageX "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/volcengine-imagex"
pVolcEngineLive "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-live" pVolcEngineLive "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/volcengine-live"
pVolcEngineTOS "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-tos" pVolcEngineTOS "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/volcengine-tos"
pWangsuCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/wangsu-cdn" pWangsuCDN "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/wangsu-cdn"
pWangsuCDNPro "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/wangsu-cdnpro" pWangsuCDNPro "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/wangsu-cdnpro"
pWangsuCertificate "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/wangsu-certificate" pWangsuCertificate "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/wangsu-certificate"
pWebhook "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/webhook" pWebhook "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/webhook"
xhttp "github.com/usual2970/certimate/internal/pkg/utils/http" xhttp "github.com/usual2970/certimate/internal/pkg/utils/http"
xmaps "github.com/usual2970/certimate/internal/pkg/utils/maps" xmaps "github.com/usual2970/certimate/internal/pkg/utils/maps"
xslices "github.com/usual2970/certimate/internal/pkg/utils/slices" xslices "github.com/usual2970/certimate/internal/pkg/utils/slices"
@ -113,7 +113,7 @@ type deployerProviderOptions struct {
ProviderServiceConfig map[string]any ProviderServiceConfig map[string]any
} }
func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer, error) { func createSSLDeployerProvider(options *deployerProviderOptions) (core.SSLDeployer, error) {
/* /*
注意：如果追加新的常量值，请保持以 ASCII 排序。 注意：如果追加新的常量值，请保持以 ASCII 排序。
NOTICE: If you add new constant, please keep ASCII order. NOTICE: If you add new constant, please keep ASCII order.
@ -128,7 +128,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderType1PanelConsole: case domain.DeploymentProviderType1PanelConsole:
deployer, err := p1PanelConsole.NewDeployer(&p1PanelConsole.DeployerConfig{ deployer, err := p1PanelConsole.NewSSLDeployerProvider(&p1PanelConsole.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiVersion: access.ApiVersion, ApiVersion: access.ApiVersion,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
@ -138,7 +138,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderType1PanelSite: case domain.DeploymentProviderType1PanelSite:
deployer, err := p1PanelSite.NewDeployer(&p1PanelSite.DeployerConfig{ deployer, err := p1PanelSite.NewSSLDeployerProvider(&p1PanelSite.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiVersion: access.ApiVersion, ApiVersion: access.ApiVersion,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
@ -163,7 +163,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeAliyunALB: case domain.DeploymentProviderTypeAliyunALB:
deployer, err := pAliyunALB.NewDeployer(&pAliyunALB.DeployerConfig{ deployer, err := pAliyunALB.NewSSLDeployerProvider(&pAliyunALB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -176,7 +176,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunAPIGW: case domain.DeploymentProviderTypeAliyunAPIGW:
deployer, err := pAliyunAPIGW.NewDeployer(&pAliyunAPIGW.DeployerConfig{ deployer, err := pAliyunAPIGW.NewSSLDeployerProvider(&pAliyunAPIGW.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -189,7 +189,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunCAS: case domain.DeploymentProviderTypeAliyunCAS:
deployer, err := pAliyunCAS.NewDeployer(&pAliyunCAS.DeployerConfig{ deployer, err := pAliyunCAS.NewSSLDeployerProvider(&pAliyunCAS.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -198,7 +198,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunCASDeploy: case domain.DeploymentProviderTypeAliyunCASDeploy:
deployer, err := pAliyunCASDeploy.NewDeployer(&pAliyunCASDeploy.DeployerConfig{ deployer, err := pAliyunCASDeploy.NewSSLDeployerProvider(&pAliyunCASDeploy.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -209,7 +209,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunCDN: case domain.DeploymentProviderTypeAliyunCDN:
deployer, err := pAliyunCDN.NewDeployer(&pAliyunCDN.DeployerConfig{ deployer, err := pAliyunCDN.NewSSLDeployerProvider(&pAliyunCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -218,7 +218,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunCLB: case domain.DeploymentProviderTypeAliyunCLB:
deployer, err := pAliyunCLB.NewDeployer(&pAliyunCLB.DeployerConfig{ deployer, err := pAliyunCLB.NewSSLDeployerProvider(&pAliyunCLB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -231,7 +231,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunDCDN: case domain.DeploymentProviderTypeAliyunDCDN:
deployer, err := pAliyunDCDN.NewDeployer(&pAliyunDCDN.DeployerConfig{ deployer, err := pAliyunDCDN.NewSSLDeployerProvider(&pAliyunDCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -240,7 +240,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunDDoS: case domain.DeploymentProviderTypeAliyunDDoS:
deployer, err := pAliyunDDoS.NewDeployer(&pAliyunDDoS.DeployerConfig{ deployer, err := pAliyunDDoS.NewSSLDeployerProvider(&pAliyunDDoS.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -250,7 +250,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunESA: case domain.DeploymentProviderTypeAliyunESA:
deployer, err := pAliyunESA.NewDeployer(&pAliyunESA.DeployerConfig{ deployer, err := pAliyunESA.NewSSLDeployerProvider(&pAliyunESA.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -259,7 +259,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunFC: case domain.DeploymentProviderTypeAliyunFC:
deployer, err := pAliyunFC.NewDeployer(&pAliyunFC.DeployerConfig{ deployer, err := pAliyunFC.NewSSLDeployerProvider(&pAliyunFC.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -270,7 +270,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunGA: case domain.DeploymentProviderTypeAliyunGA:
deployer, err := pAliyunGA.NewDeployer(&pAliyunGA.DeployerConfig{ deployer, err := pAliyunGA.NewSSLDeployerProvider(&pAliyunGA.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -282,7 +282,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunLive: case domain.DeploymentProviderTypeAliyunLive:
deployer, err := pAliyunLive.NewDeployer(&pAliyunLive.DeployerConfig{ deployer, err := pAliyunLive.NewSSLDeployerProvider(&pAliyunLive.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -291,7 +291,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunNLB: case domain.DeploymentProviderTypeAliyunNLB:
deployer, err := pAliyunNLB.NewDeployer(&pAliyunNLB.DeployerConfig{ deployer, err := pAliyunNLB.NewSSLDeployerProvider(&pAliyunNLB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -303,7 +303,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunOSS: case domain.DeploymentProviderTypeAliyunOSS:
deployer, err := pAliyunOSS.NewDeployer(&pAliyunOSS.DeployerConfig{ deployer, err := pAliyunOSS.NewSSLDeployerProvider(&pAliyunOSS.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -314,7 +314,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunVOD: case domain.DeploymentProviderTypeAliyunVOD:
deployer, err := pAliyunVOD.NewDeployer(&pAliyunVOD.DeployerConfig{ deployer, err := pAliyunVOD.NewSSLDeployerProvider(&pAliyunVOD.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -324,7 +324,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAliyunWAF: case domain.DeploymentProviderTypeAliyunWAF:
deployer, err := pAliyunWAF.NewDeployer(&pAliyunWAF.DeployerConfig{ deployer, err := pAliyunWAF.NewSSLDeployerProvider(&pAliyunWAF.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ResourceGroupId: access.ResourceGroupId, ResourceGroupId: access.ResourceGroupId,
@ -347,7 +347,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pAPISIX.NewDeployer(&pAPISIX.DeployerConfig{ deployer, err := pAPISIX.NewSSLDeployerProvider(&pAPISIX.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
AllowInsecureConnections: access.AllowInsecureConnections, AllowInsecureConnections: access.AllowInsecureConnections,
@ -366,7 +366,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeAWSACM: case domain.DeploymentProviderTypeAWSACM:
deployer, err := pAWSACM.NewDeployer(&pAWSACM.DeployerConfig{ deployer, err := pAWSACM.NewSSLDeployerProvider(&pAWSACM.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -375,7 +375,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAWSCloudFront: case domain.DeploymentProviderTypeAWSCloudFront:
deployer, err := pAWSCloudFront.NewDeployer(&pAWSCloudFront.DeployerConfig{ deployer, err := pAWSCloudFront.NewSSLDeployerProvider(&pAWSCloudFront.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -385,7 +385,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeAWSIAM: case domain.DeploymentProviderTypeAWSIAM:
deployer, err := pAWSIAM.NewDeployer(&pAWSIAM.DeployerConfig{ deployer, err := pAWSIAM.NewSSLDeployerProvider(&pAWSIAM.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -407,7 +407,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeAzureKeyVault: case domain.DeploymentProviderTypeAzureKeyVault:
deployer, err := pAzureKeyVault.NewDeployer(&pAzureKeyVault.DeployerConfig{ deployer, err := pAzureKeyVault.NewSSLDeployerProvider(&pAzureKeyVault.SSLDeployerProviderConfig{
TenantId: access.TenantId, TenantId: access.TenantId,
ClientId: access.ClientId, ClientId: access.ClientId,
ClientSecret: access.ClientSecret, ClientSecret: access.ClientSecret,
@ -431,7 +431,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeBaiduCloudAppBLB: case domain.DeploymentProviderTypeBaiduCloudAppBLB:
deployer, err := pBaiduCloudAppBLB.NewDeployer(&pBaiduCloudAppBLB.DeployerConfig{ deployer, err := pBaiduCloudAppBLB.NewSSLDeployerProvider(&pBaiduCloudAppBLB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -443,7 +443,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeBaiduCloudBLB: case domain.DeploymentProviderTypeBaiduCloudBLB:
deployer, err := pBaiduCloudBLB.NewDeployer(&pBaiduCloudBLB.DeployerConfig{ deployer, err := pBaiduCloudBLB.NewSSLDeployerProvider(&pBaiduCloudBLB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -455,7 +455,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeBaiduCloudCDN: case domain.DeploymentProviderTypeBaiduCloudCDN:
deployer, err := pBaiduCloudCDN.NewDeployer(&pBaiduCloudCDN.DeployerConfig{ deployer, err := pBaiduCloudCDN.NewSSLDeployerProvider(&pBaiduCloudCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -463,7 +463,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeBaiduCloudCert: case domain.DeploymentProviderTypeBaiduCloudCert:
deployer, err := pBaiduCloudCert.NewDeployer(&pBaiduCloudCert.DeployerConfig{ deployer, err := pBaiduCloudCert.NewSSLDeployerProvider(&pBaiduCloudCert.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
}) })
@ -483,7 +483,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeBaishanCDN: case domain.DeploymentProviderTypeBaishanCDN:
deployer, err := pBaishanCDN.NewDeployer(&pBaishanCDN.DeployerConfig{ deployer, err := pBaishanCDN.NewSSLDeployerProvider(&pBaishanCDN.SSLDeployerProviderConfig{
ApiToken: access.ApiToken, ApiToken: access.ApiToken,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
CertificateId: xmaps.GetString(options.ProviderServiceConfig, "certificateId"), CertificateId: xmaps.GetString(options.ProviderServiceConfig, "certificateId"),
@ -504,7 +504,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeBaotaPanelConsole: case domain.DeploymentProviderTypeBaotaPanelConsole:
deployer, err := pBaotaPanelConsole.NewDeployer(&pBaotaPanelConsole.DeployerConfig{ deployer, err := pBaotaPanelConsole.NewSSLDeployerProvider(&pBaotaPanelConsole.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
AllowInsecureConnections: access.AllowInsecureConnections, AllowInsecureConnections: access.AllowInsecureConnections,
@ -513,7 +513,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeBaotaPanelSite: case domain.DeploymentProviderTypeBaotaPanelSite:
deployer, err := pBaotaPanelSite.NewDeployer(&pBaotaPanelSite.DeployerConfig{ deployer, err := pBaotaPanelSite.NewSSLDeployerProvider(&pBaotaPanelSite.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
AllowInsecureConnections: access.AllowInsecureConnections, AllowInsecureConnections: access.AllowInsecureConnections,
@ -537,7 +537,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeBaotaWAFConsole: case domain.DeploymentProviderTypeBaotaWAFConsole:
deployer, err := pBaotaWAFConsole.NewDeployer(&pBaotaWAFConsole.DeployerConfig{ deployer, err := pBaotaWAFConsole.NewSSLDeployerProvider(&pBaotaWAFConsole.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
AllowInsecureConnections: access.AllowInsecureConnections, AllowInsecureConnections: access.AllowInsecureConnections,
@ -545,7 +545,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeBaotaWAFSite: case domain.DeploymentProviderTypeBaotaWAFSite:
deployer, err := pBaotaWAFSite.NewDeployer(&pBaotaWAFSite.DeployerConfig{ deployer, err := pBaotaWAFSite.NewSSLDeployerProvider(&pBaotaWAFSite.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
AllowInsecureConnections: access.AllowInsecureConnections, AllowInsecureConnections: access.AllowInsecureConnections,
@ -566,7 +566,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pBunnyCDN.NewDeployer(&pBunnyCDN.DeployerConfig{ deployer, err := pBunnyCDN.NewSSLDeployerProvider(&pBunnyCDN.SSLDeployerProviderConfig{
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
PullZoneId: xmaps.GetString(options.ProviderServiceConfig, "pullZoneId"), PullZoneId: xmaps.GetString(options.ProviderServiceConfig, "pullZoneId"),
Hostname: xmaps.GetString(options.ProviderServiceConfig, "hostname"), Hostname: xmaps.GetString(options.ProviderServiceConfig, "hostname"),
@ -583,7 +583,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeBytePlusCDN: case domain.DeploymentProviderTypeBytePlusCDN:
deployer, err := pBytePlusCDN.NewDeployer(&pBytePlusCDN.DeployerConfig{ deployer, err := pBytePlusCDN.NewSSLDeployerProvider(&pBytePlusCDN.SSLDeployerProviderConfig{
AccessKey: access.AccessKey, AccessKey: access.AccessKey,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -602,7 +602,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pCacheFly.NewDeployer(&pCacheFly.DeployerConfig{ deployer, err := pCacheFly.NewSSLDeployerProvider(&pCacheFly.SSLDeployerProviderConfig{
ApiToken: access.ApiToken, ApiToken: access.ApiToken,
}) })
return deployer, err return deployer, err
@ -615,7 +615,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pCdnfly.NewDeployer(&pCdnfly.DeployerConfig{ deployer, err := pCdnfly.NewSSLDeployerProvider(&pCdnfly.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
ApiSecret: access.ApiSecret, ApiSecret: access.ApiSecret,
@ -636,7 +636,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeCTCCCloudAO: case domain.DeploymentProviderTypeCTCCCloudAO:
deployer, err := pCTCCCloudAO.NewDeployer(&pCTCCCloudAO.DeployerConfig{ deployer, err := pCTCCCloudAO.NewSSLDeployerProvider(&pCTCCCloudAO.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -644,7 +644,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeCTCCCloudCDN: case domain.DeploymentProviderTypeCTCCCloudCDN:
deployer, err := pCTCCCloudCDN.NewDeployer(&pCTCCCloudCDN.DeployerConfig{ deployer, err := pCTCCCloudCDN.NewSSLDeployerProvider(&pCTCCCloudCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -652,14 +652,14 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeCTCCCloudCMS: case domain.DeploymentProviderTypeCTCCCloudCMS:
deployer, err := pCTCCCloudCMS.NewDeployer(&pCTCCCloudCMS.DeployerConfig{ deployer, err := pCTCCCloudCMS.NewSSLDeployerProvider(&pCTCCCloudCMS.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
}) })
return deployer, err return deployer, err
case domain.DeploymentProviderTypeCTCCCloudELB: case domain.DeploymentProviderTypeCTCCCloudELB:
deployer, err := pCTCCCloudELB.NewDeployer(&pCTCCCloudELB.DeployerConfig{ deployer, err := pCTCCCloudELB.NewSSLDeployerProvider(&pCTCCCloudELB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
RegionId: xmaps.GetString(options.ProviderServiceConfig, "regionId"), RegionId: xmaps.GetString(options.ProviderServiceConfig, "regionId"),
@ -670,7 +670,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeCTCCCloudICDN: case domain.DeploymentProviderTypeCTCCCloudICDN:
deployer, err := pCTCCCloudICDN.NewDeployer(&pCTCCCloudICDN.DeployerConfig{ deployer, err := pCTCCCloudICDN.NewSSLDeployerProvider(&pCTCCCloudICDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -678,7 +678,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeCTCCCloudLVDN: case domain.DeploymentProviderTypeCTCCCloudLVDN:
deployer, err := pCTCCCloudLVDN.NewDeployer(&pCTCCCloudLVDN.DeployerConfig{ deployer, err := pCTCCCloudLVDN.NewSSLDeployerProvider(&pCTCCCloudLVDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -697,7 +697,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pDogeCDN.NewDeployer(&pDogeCDN.DeployerConfig{ deployer, err := pDogeCDN.NewSSLDeployerProvider(&pDogeCDN.SSLDeployerProviderConfig{
AccessKey: access.AccessKey, AccessKey: access.AccessKey,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -712,7 +712,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pEdgioApplications.NewDeployer(&pEdgioApplications.DeployerConfig{ deployer, err := pEdgioApplications.NewSSLDeployerProvider(&pEdgioApplications.SSLDeployerProviderConfig{
ClientId: access.ClientId, ClientId: access.ClientId,
ClientSecret: access.ClientSecret, ClientSecret: access.ClientSecret,
EnvironmentId: xmaps.GetString(options.ProviderServiceConfig, "environmentId"), EnvironmentId: xmaps.GetString(options.ProviderServiceConfig, "environmentId"),
@ -727,7 +727,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pFlexCDN.NewDeployer(&pFlexCDN.DeployerConfig{ deployer, err := pFlexCDN.NewSSLDeployerProvider(&pFlexCDN.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiRole: access.ApiRole, ApiRole: access.ApiRole,
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
@ -748,7 +748,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeGcoreCDN: case domain.DeploymentProviderTypeGcoreCDN:
deployer, err := pGcoreCDN.NewDeployer(&pGcoreCDN.DeployerConfig{ deployer, err := pGcoreCDN.NewSSLDeployerProvider(&pGcoreCDN.SSLDeployerProviderConfig{
ApiToken: access.ApiToken, ApiToken: access.ApiToken,
ResourceId: xmaps.GetInt64(options.ProviderServiceConfig, "resourceId"), ResourceId: xmaps.GetInt64(options.ProviderServiceConfig, "resourceId"),
CertificateId: xmaps.GetInt64(options.ProviderServiceConfig, "certificateId"), CertificateId: xmaps.GetInt64(options.ProviderServiceConfig, "certificateId"),
@ -767,7 +767,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pGoEdge.NewDeployer(&pGoEdge.DeployerConfig{ deployer, err := pGoEdge.NewSSLDeployerProvider(&pGoEdge.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiRole: access.ApiRole, ApiRole: access.ApiRole,
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
@ -788,7 +788,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeHuaweiCloudCDN: case domain.DeploymentProviderTypeHuaweiCloudCDN:
deployer, err := pHuaweiCloudCDN.NewDeployer(&pHuaweiCloudCDN.DeployerConfig{ deployer, err := pHuaweiCloudCDN.NewSSLDeployerProvider(&pHuaweiCloudCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
EnterpriseProjectId: access.EnterpriseProjectId, EnterpriseProjectId: access.EnterpriseProjectId,
@ -798,7 +798,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeHuaweiCloudELB: case domain.DeploymentProviderTypeHuaweiCloudELB:
deployer, err := pHuaweiCloudELB.NewDeployer(&pHuaweiCloudELB.DeployerConfig{ deployer, err := pHuaweiCloudELB.NewSSLDeployerProvider(&pHuaweiCloudELB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
EnterpriseProjectId: access.EnterpriseProjectId, EnterpriseProjectId: access.EnterpriseProjectId,
@ -811,7 +811,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeHuaweiCloudSCM: case domain.DeploymentProviderTypeHuaweiCloudSCM:
deployer, err := pHuaweiCloudSCM.NewDeployer(&pHuaweiCloudSCM.DeployerConfig{ deployer, err := pHuaweiCloudSCM.NewSSLDeployerProvider(&pHuaweiCloudSCM.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
EnterpriseProjectId: access.EnterpriseProjectId, EnterpriseProjectId: access.EnterpriseProjectId,
@ -819,7 +819,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeHuaweiCloudWAF: case domain.DeploymentProviderTypeHuaweiCloudWAF:
deployer, err := pHuaweiCloudWAF.NewDeployer(&pHuaweiCloudWAF.DeployerConfig{ deployer, err := pHuaweiCloudWAF.NewSSLDeployerProvider(&pHuaweiCloudWAF.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
SecretAccessKey: access.SecretAccessKey, SecretAccessKey: access.SecretAccessKey,
EnterpriseProjectId: access.EnterpriseProjectId, EnterpriseProjectId: access.EnterpriseProjectId,
@ -844,7 +844,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeJDCloudALB: case domain.DeploymentProviderTypeJDCloudALB:
deployer, err := pJDCloudALB.NewDeployer(&pJDCloudALB.DeployerConfig{ deployer, err := pJDCloudALB.NewSSLDeployerProvider(&pJDCloudALB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
RegionId: xmaps.GetString(options.ProviderServiceConfig, "regionId"), RegionId: xmaps.GetString(options.ProviderServiceConfig, "regionId"),
@ -855,7 +855,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeJDCloudCDN: case domain.DeploymentProviderTypeJDCloudCDN:
deployer, err := pJDCloudCDN.NewDeployer(&pJDCloudCDN.DeployerConfig{ deployer, err := pJDCloudCDN.NewSSLDeployerProvider(&pJDCloudCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -863,7 +863,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeJDCloudLive: case domain.DeploymentProviderTypeJDCloudLive:
deployer, err := pJDCloudLive.NewDeployer(&pJDCloudLive.DeployerConfig{ deployer, err := pJDCloudLive.NewSSLDeployerProvider(&pJDCloudLive.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -871,7 +871,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeJDCloudVOD: case domain.DeploymentProviderTypeJDCloudVOD:
deployer, err := pJDCloudVOD.NewDeployer(&pJDCloudVOD.DeployerConfig{ deployer, err := pJDCloudVOD.NewSSLDeployerProvider(&pJDCloudVOD.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -890,7 +890,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pLeCDN.NewDeployer(&pLeCDN.DeployerConfig{ deployer, err := pLeCDN.NewSSLDeployerProvider(&pLeCDN.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiVersion: access.ApiVersion, ApiVersion: access.ApiVersion,
ApiRole: access.ApiRole, ApiRole: access.ApiRole,
@ -906,7 +906,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
case domain.DeploymentProviderTypeLocal: case domain.DeploymentProviderTypeLocal:
{ {
deployer, err := pLocal.NewDeployer(&pLocal.DeployerConfig{ deployer, err := pLocal.NewSSLDeployerProvider(&pLocal.SSLDeployerProviderConfig{
ShellEnv: pLocal.ShellEnvType(xmaps.GetString(options.ProviderServiceConfig, "shellEnv")), ShellEnv: pLocal.ShellEnvType(xmaps.GetString(options.ProviderServiceConfig, "shellEnv")),
PreCommand: xmaps.GetString(options.ProviderServiceConfig, "preCommand"), PreCommand: xmaps.GetString(options.ProviderServiceConfig, "preCommand"),
PostCommand: xmaps.GetString(options.ProviderServiceConfig, "postCommand"), PostCommand: xmaps.GetString(options.ProviderServiceConfig, "postCommand"),
@ -930,7 +930,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pK8sSecret.NewDeployer(&pK8sSecret.DeployerConfig{ deployer, err := pK8sSecret.NewSSLDeployerProvider(&pK8sSecret.SSLDeployerProviderConfig{
KubeConfig: access.KubeConfig, KubeConfig: access.KubeConfig,
Namespace: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "namespace", "default"), Namespace: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "namespace", "default"),
SecretName: xmaps.GetString(options.ProviderServiceConfig, "secretName"), SecretName: xmaps.GetString(options.ProviderServiceConfig, "secretName"),
@ -948,7 +948,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pNetlifySite.NewDeployer(&pNetlifySite.DeployerConfig{ deployer, err := pNetlifySite.NewSSLDeployerProvider(&pNetlifySite.SSLDeployerProviderConfig{
ApiToken: access.ApiToken, ApiToken: access.ApiToken,
SiteId: xmaps.GetString(options.ProviderServiceConfig, "siteId"), SiteId: xmaps.GetString(options.ProviderServiceConfig, "siteId"),
}) })
@ -962,7 +962,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pProxmoxVE.NewDeployer(&pProxmoxVE.DeployerConfig{ deployer, err := pProxmoxVE.NewSSLDeployerProvider(&pProxmoxVE.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiToken: access.ApiToken, ApiToken: access.ApiToken,
ApiTokenSecret: access.ApiTokenSecret, ApiTokenSecret: access.ApiTokenSecret,
@ -982,7 +982,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeQiniuCDN, domain.DeploymentProviderTypeQiniuKodo: case domain.DeploymentProviderTypeQiniuCDN, domain.DeploymentProviderTypeQiniuKodo:
deployer, err := pQiniuCDN.NewDeployer(&pQiniuCDN.DeployerConfig{ deployer, err := pQiniuCDN.NewSSLDeployerProvider(&pQiniuCDN.SSLDeployerProviderConfig{
AccessKey: access.AccessKey, AccessKey: access.AccessKey,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -990,7 +990,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeQiniuPili: case domain.DeploymentProviderTypeQiniuPili:
deployer, err := pQiniuPili.NewDeployer(&pQiniuPili.DeployerConfig{ deployer, err := pQiniuPili.NewSSLDeployerProvider(&pQiniuPili.SSLDeployerProviderConfig{
AccessKey: access.AccessKey, AccessKey: access.AccessKey,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Hub: xmaps.GetString(options.ProviderServiceConfig, "hub"), Hub: xmaps.GetString(options.ProviderServiceConfig, "hub"),
@ -1012,7 +1012,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeTencentCloudCDN: case domain.DeploymentProviderTypeTencentCloudCDN:
deployer, err := pRainYunRCDN.NewDeployer(&pRainYunRCDN.DeployerConfig{ deployer, err := pRainYunRCDN.NewSSLDeployerProvider(&pRainYunRCDN.SSLDeployerProviderConfig{
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
InstanceId: xmaps.GetInt32(options.ProviderServiceConfig, "instanceId"), InstanceId: xmaps.GetInt32(options.ProviderServiceConfig, "instanceId"),
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1033,7 +1033,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeRatPanelConsole: case domain.DeploymentProviderTypeRatPanelConsole:
deployer, err := pRatPanelConsole.NewDeployer(&pRatPanelConsole.DeployerConfig{ deployer, err := pRatPanelConsole.NewSSLDeployerProvider(&pRatPanelConsole.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
AccessTokenId: access.AccessTokenId, AccessTokenId: access.AccessTokenId,
AccessToken: access.AccessToken, AccessToken: access.AccessToken,
@ -1042,7 +1042,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeRatPanelSite: case domain.DeploymentProviderTypeRatPanelSite:
deployer, err := pRatPanelSite.NewDeployer(&pRatPanelSite.DeployerConfig{ deployer, err := pRatPanelSite.NewSSLDeployerProvider(&pRatPanelSite.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
AccessTokenId: access.AccessTokenId, AccessTokenId: access.AccessTokenId,
AccessToken: access.AccessToken, AccessToken: access.AccessToken,
@ -1063,7 +1063,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pSafeLine.NewDeployer(&pSafeLine.DeployerConfig{ deployer, err := pSafeLine.NewSSLDeployerProvider(&pSafeLine.SSLDeployerProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
ApiToken: access.ApiToken, ApiToken: access.ApiToken,
AllowInsecureConnections: access.AllowInsecureConnections, AllowInsecureConnections: access.AllowInsecureConnections,
@ -1093,7 +1093,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
} }
} }
deployer, err := pSSH.NewDeployer(&pSSH.DeployerConfig{ deployer, err := pSSH.NewSSLDeployerProvider(&pSSH.SSLDeployerProviderConfig{
SshHost: access.Host, SshHost: access.Host,
SshPort: access.Port, SshPort: access.Port,
SshAuthMethod: access.AuthMethod, SshAuthMethod: access.AuthMethod,
@ -1127,7 +1127,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeTencentCloudCDN: case domain.DeploymentProviderTypeTencentCloudCDN:
deployer, err := pTencentCloudCDN.NewDeployer(&pTencentCloudCDN.DeployerConfig{ deployer, err := pTencentCloudCDN.NewSSLDeployerProvider(&pTencentCloudCDN.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1135,7 +1135,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudCLB: case domain.DeploymentProviderTypeTencentCloudCLB:
deployer, err := pTencentCloudCLB.NewDeployer(&pTencentCloudCLB.DeployerConfig{ deployer, err := pTencentCloudCLB.NewSSLDeployerProvider(&pTencentCloudCLB.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1147,7 +1147,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudCOS: case domain.DeploymentProviderTypeTencentCloudCOS:
deployer, err := pTencentCloudCOS.NewDeployer(&pTencentCloudCOS.DeployerConfig{ deployer, err := pTencentCloudCOS.NewSSLDeployerProvider(&pTencentCloudCOS.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1157,7 +1157,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudCSS: case domain.DeploymentProviderTypeTencentCloudCSS:
deployer, err := pTencentCloudCSS.NewDeployer(&pTencentCloudCSS.DeployerConfig{ deployer, err := pTencentCloudCSS.NewSSLDeployerProvider(&pTencentCloudCSS.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1165,7 +1165,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudECDN: case domain.DeploymentProviderTypeTencentCloudECDN:
deployer, err := pTencentCloudECDN.NewDeployer(&pTencentCloudECDN.DeployerConfig{ deployer, err := pTencentCloudECDN.NewSSLDeployerProvider(&pTencentCloudECDN.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1173,7 +1173,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudEO: case domain.DeploymentProviderTypeTencentCloudEO:
deployer, err := pTencentCloudEO.NewDeployer(&pTencentCloudEO.DeployerConfig{ deployer, err := pTencentCloudEO.NewSSLDeployerProvider(&pTencentCloudEO.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
ZoneId: xmaps.GetString(options.ProviderServiceConfig, "zoneId"), ZoneId: xmaps.GetString(options.ProviderServiceConfig, "zoneId"),
@ -1182,7 +1182,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudGAAP: case domain.DeploymentProviderTypeTencentCloudGAAP:
deployer, err := pTencentCloudGAAP.NewDeployer(&pTencentCloudGAAP.DeployerConfig{ deployer, err := pTencentCloudGAAP.NewSSLDeployerProvider(&pTencentCloudGAAP.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
ResourceType: pTencentCloudGAAP.ResourceType(xmaps.GetString(options.ProviderServiceConfig, "resourceType")), ResourceType: pTencentCloudGAAP.ResourceType(xmaps.GetString(options.ProviderServiceConfig, "resourceType")),
@ -1192,7 +1192,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudSCF: case domain.DeploymentProviderTypeTencentCloudSCF:
deployer, err := pTencentCloudSCF.NewDeployer(&pTencentCloudSCF.DeployerConfig{ deployer, err := pTencentCloudSCF.NewSSLDeployerProvider(&pTencentCloudSCF.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1201,14 +1201,14 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudSSL: case domain.DeploymentProviderTypeTencentCloudSSL:
deployer, err := pTencentCloudSSL.NewDeployer(&pTencentCloudSSL.DeployerConfig{ deployer, err := pTencentCloudSSL.NewSSLDeployerProvider(&pTencentCloudSSL.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
}) })
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudSSLDeploy: case domain.DeploymentProviderTypeTencentCloudSSLDeploy:
deployer, err := pTencentCloudSSLDeploy.NewDeployer(&pTencentCloudSSLDeploy.DeployerConfig{ deployer, err := pTencentCloudSSLDeploy.NewSSLDeployerProvider(&pTencentCloudSSLDeploy.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1218,7 +1218,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudVOD: case domain.DeploymentProviderTypeTencentCloudVOD:
deployer, err := pTencentCloudVOD.NewDeployer(&pTencentCloudVOD.DeployerConfig{ deployer, err := pTencentCloudVOD.NewSSLDeployerProvider(&pTencentCloudVOD.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
SubAppId: xmaps.GetInt64(options.ProviderServiceConfig, "subAppId"), SubAppId: xmaps.GetInt64(options.ProviderServiceConfig, "subAppId"),
@ -1227,7 +1227,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeTencentCloudWAF: case domain.DeploymentProviderTypeTencentCloudWAF:
deployer, err := pTencentCloudWAF.NewDeployer(&pTencentCloudWAF.DeployerConfig{ deployer, err := pTencentCloudWAF.NewSSLDeployerProvider(&pTencentCloudWAF.SSLDeployerProviderConfig{
SecretId: access.SecretId, SecretId: access.SecretId,
SecretKey: access.SecretKey, SecretKey: access.SecretKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1250,7 +1250,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeUCloudUCDN: case domain.DeploymentProviderTypeUCloudUCDN:
deployer, err := pUCloudUCDN.NewDeployer(&pUCloudUCDN.DeployerConfig{ deployer, err := pUCloudUCDN.NewSSLDeployerProvider(&pUCloudUCDN.SSLDeployerProviderConfig{
PrivateKey: access.PrivateKey, PrivateKey: access.PrivateKey,
PublicKey: access.PublicKey, PublicKey: access.PublicKey,
ProjectId: access.ProjectId, ProjectId: access.ProjectId,
@ -1259,7 +1259,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeUCloudUS3: case domain.DeploymentProviderTypeUCloudUS3:
deployer, err := pUCloudUS3.NewDeployer(&pUCloudUS3.DeployerConfig{ deployer, err := pUCloudUS3.NewSSLDeployerProvider(&pUCloudUS3.SSLDeployerProviderConfig{
PrivateKey: access.PrivateKey, PrivateKey: access.PrivateKey,
PublicKey: access.PublicKey, PublicKey: access.PublicKey,
ProjectId: access.ProjectId, ProjectId: access.ProjectId,
@ -1281,7 +1281,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
deployer, err := pUniCloudWebHost.NewDeployer(&pUniCloudWebHost.DeployerConfig{ deployer, err := pUniCloudWebHost.NewSSLDeployerProvider(&pUniCloudWebHost.SSLDeployerProviderConfig{
Username: access.Username, Username: access.Username,
Password: access.Password, Password: access.Password,
SpaceProvider: xmaps.GetString(options.ProviderServiceConfig, "spaceProvider"), SpaceProvider: xmaps.GetString(options.ProviderServiceConfig, "spaceProvider"),
@ -1300,7 +1300,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeUpyunCDN, domain.DeploymentProviderTypeUpyunFile: case domain.DeploymentProviderTypeUpyunCDN, domain.DeploymentProviderTypeUpyunFile:
deployer, err := pUpyunCDN.NewDeployer(&pUpyunCDN.DeployerConfig{ deployer, err := pUpyunCDN.NewSSLDeployerProvider(&pUpyunCDN.SSLDeployerProviderConfig{
Username: access.Username, Username: access.Username,
Password: access.Password, Password: access.Password,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1321,7 +1321,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeVolcEngineALB: case domain.DeploymentProviderTypeVolcEngineALB:
deployer, err := pVolcEngineALB.NewDeployer(&pVolcEngineALB.DeployerConfig{ deployer, err := pVolcEngineALB.NewSSLDeployerProvider(&pVolcEngineALB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.SecretAccessKey, AccessKeySecret: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1333,7 +1333,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeVolcEngineCDN: case domain.DeploymentProviderTypeVolcEngineCDN:
deployer, err := pVolcEngineCDN.NewDeployer(&pVolcEngineCDN.DeployerConfig{ deployer, err := pVolcEngineCDN.NewSSLDeployerProvider(&pVolcEngineCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.SecretAccessKey, AccessKeySecret: access.SecretAccessKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1341,7 +1341,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeVolcEngineCertCenter: case domain.DeploymentProviderTypeVolcEngineCertCenter:
deployer, err := pVolcEngineCertCenter.NewDeployer(&pVolcEngineCertCenter.DeployerConfig{ deployer, err := pVolcEngineCertCenter.NewSSLDeployerProvider(&pVolcEngineCertCenter.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.SecretAccessKey, AccessKeySecret: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1349,7 +1349,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeVolcEngineCLB: case domain.DeploymentProviderTypeVolcEngineCLB:
deployer, err := pVolcEngineCLB.NewDeployer(&pVolcEngineCLB.DeployerConfig{ deployer, err := pVolcEngineCLB.NewSSLDeployerProvider(&pVolcEngineCLB.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.SecretAccessKey, AccessKeySecret: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1360,7 +1360,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeVolcEngineDCDN: case domain.DeploymentProviderTypeVolcEngineDCDN:
deployer, err := pVolcEngineDCDN.NewDeployer(&pVolcEngineDCDN.DeployerConfig{ deployer, err := pVolcEngineDCDN.NewSSLDeployerProvider(&pVolcEngineDCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.SecretAccessKey, AccessKeySecret: access.SecretAccessKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1368,7 +1368,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeVolcEngineImageX: case domain.DeploymentProviderTypeVolcEngineImageX:
deployer, err := pVolcEngineImageX.NewDeployer(&pVolcEngineImageX.DeployerConfig{ deployer, err := pVolcEngineImageX.NewSSLDeployerProvider(&pVolcEngineImageX.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.SecretAccessKey, AccessKeySecret: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1378,7 +1378,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeVolcEngineLive: case domain.DeploymentProviderTypeVolcEngineLive:
deployer, err := pVolcEngineLive.NewDeployer(&pVolcEngineLive.DeployerConfig{ deployer, err := pVolcEngineLive.NewSSLDeployerProvider(&pVolcEngineLive.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.SecretAccessKey, AccessKeySecret: access.SecretAccessKey,
Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"), Domain: xmaps.GetString(options.ProviderServiceConfig, "domain"),
@ -1386,7 +1386,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeVolcEngineTOS: case domain.DeploymentProviderTypeVolcEngineTOS:
deployer, err := pVolcEngineTOS.NewDeployer(&pVolcEngineTOS.DeployerConfig{ deployer, err := pVolcEngineTOS.NewSSLDeployerProvider(&pVolcEngineTOS.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.SecretAccessKey, AccessKeySecret: access.SecretAccessKey,
Region: xmaps.GetString(options.ProviderServiceConfig, "region"), Region: xmaps.GetString(options.ProviderServiceConfig, "region"),
@ -1409,7 +1409,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
switch options.Provider { switch options.Provider {
case domain.DeploymentProviderTypeWangsuCDN: case domain.DeploymentProviderTypeWangsuCDN:
deployer, err := pWangsuCDN.NewDeployer(&pWangsuCDN.DeployerConfig{ deployer, err := pWangsuCDN.NewSSLDeployerProvider(&pWangsuCDN.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
Domains: xslices.Filter(strings.Split(xmaps.GetString(options.ProviderServiceConfig, "domains"), ";"), func(s string) bool { return s != "" }), Domains: xslices.Filter(strings.Split(xmaps.GetString(options.ProviderServiceConfig, "domains"), ";"), func(s string) bool { return s != "" }),
@ -1417,7 +1417,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeWangsuCDNPro: case domain.DeploymentProviderTypeWangsuCDNPro:
deployer, err := pWangsuCDNPro.NewDeployer(&pWangsuCDNPro.DeployerConfig{ deployer, err := pWangsuCDNPro.NewSSLDeployerProvider(&pWangsuCDNPro.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
ApiKey: access.ApiKey, ApiKey: access.ApiKey,
@ -1429,7 +1429,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
return deployer, err return deployer, err
case domain.DeploymentProviderTypeWangsuCertificate: case domain.DeploymentProviderTypeWangsuCertificate:
deployer, err := pWangsuCertificate.NewDeployer(&pWangsuCertificate.DeployerConfig{ deployer, err := pWangsuCertificate.NewSSLDeployerProvider(&pWangsuCertificate.SSLDeployerProviderConfig{
AccessKeyId: access.AccessKeyId, AccessKeyId: access.AccessKeyId,
AccessKeySecret: access.AccessKeySecret, AccessKeySecret: access.AccessKeySecret,
CertificateId: xmaps.GetString(options.ProviderServiceConfig, "certificateId"), CertificateId: xmaps.GetString(options.ProviderServiceConfig, "certificateId"),
@ -1468,7 +1468,7 @@ func createDeployerProvider(options *deployerProviderOptions) (deployer.Deployer
} }
} }
deployer, err := pWebhook.NewDeployer(&pWebhook.DeployerConfig{ deployer, err := pWebhook.NewSSLDeployerProvider(&pWebhook.SSLDeployerProviderConfig{
WebhookUrl: access.Url, WebhookUrl: access.Url,
WebhookData: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "webhookData", access.DefaultDataForDeployment), WebhookData: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "webhookData", access.DefaultDataForDeployment),
Method: access.Method, Method: access.Method,

10
internal/notify/notifier.go
View File

@ -6,7 +6,7 @@ import (
"log/slog" "log/slog"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/repository" "github.com/usual2970/certimate/internal/repository"
) )
@ -46,20 +46,22 @@ func NewWithWorkflowNode(config NotifierWithWorkflowNodeConfig) (Notifier, error
} }
} }
notifierProvider, err := createNotifierProvider(options) notifier, err := createNotifierProvider(options)
if err != nil { if err != nil {
return nil, err return nil, err
} else {
notifier.SetLogger(config.Logger)
} }
return &notifierImpl{ return &notifierImpl{
provider: notifierProvider.WithLogger(config.Logger), provider: notifier,
subject: config.Subject, subject: config.Subject,
message: config.Message, message: config.Message,
}, nil }, nil
} }
type notifierImpl struct { type notifierImpl struct {
provider notifier.Notifier provider core.Notifier
subject string subject string
message string message string
} }

6
internal/notify/notify.go
View File

@ -8,7 +8,7 @@ import (
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
xmaps "github.com/usual2970/certimate/internal/pkg/utils/maps" xmaps "github.com/usual2970/certimate/internal/pkg/utils/maps"
"github.com/usual2970/certimate/internal/repository" "github.com/usual2970/certimate/internal/repository"
) )
@ -51,7 +51,7 @@ func SendToChannel(subject, message string, channel string, channelConfig map[st
} }
// Deprecated: v0.4.x 将废弃 // Deprecated: v0.4.x 将废弃
func getEnabledNotifiers() ([]notifier.Notifier, error) { func getEnabledNotifiers() ([]core.Notifier, error) {
settingsRepo := repository.NewSettingsRepository() settingsRepo := repository.NewSettingsRepository()
settings, err := settingsRepo.GetByName(context.Background(), "notifyChannels") settings, err := settingsRepo.GetByName(context.Background(), "notifyChannels")
if err != nil { if err != nil {
@ -63,7 +63,7 @@ func getEnabledNotifiers() ([]notifier.Notifier, error) {
return nil, fmt.Errorf("unmarshal notifyChannels error: %w", err) return nil, fmt.Errorf("unmarshal notifyChannels error: %w", err)
} }
notifiers := make([]notifier.Notifier, 0) notifiers := make([]core.Notifier, 0)
for k, v := range rs { for k, v := range rs {
if !xmaps.GetBool(v, "enabled") { if !xmaps.GetBool(v, "enabled") {
continue continue

22
internal/notify/providers.go
View File

@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
pDingTalkBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalkbot" pDingTalkBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalkbot"
pDiscordBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/discordbot" pDiscordBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/discordbot"
pEmail "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/email" pEmail "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/email"
@ -25,7 +25,7 @@ type notifierProviderOptions struct {
ProviderServiceConfig map[string]any ProviderServiceConfig map[string]any
} }
func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier, error) { func createNotifierProvider(options *notifierProviderOptions) (core.Notifier, error) {
/* /*
注意：如果追加新的常量值，请保持以 ASCII 排序。 注意：如果追加新的常量值，请保持以 ASCII 排序。
NOTICE: If you add new constant, please keep ASCII order. NOTICE: If you add new constant, please keep ASCII order.
@ -38,7 +38,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
return pDingTalkBot.NewNotifier(&pDingTalkBot.NotifierConfig{ return pDingTalkBot.NewNotifierProvider(&pDingTalkBot.NotifierProviderConfig{
WebhookUrl: access.WebhookUrl, WebhookUrl: access.WebhookUrl,
Secret: access.Secret, Secret: access.Secret,
}) })
@ -51,7 +51,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
return pDiscordBot.NewNotifier(&pDiscordBot.NotifierConfig{ return pDiscordBot.NewNotifierProvider(&pDiscordBot.NotifierProviderConfig{
BotToken: access.BotToken, BotToken: access.BotToken,
ChannelId: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "channelId", access.DefaultChannelId), ChannelId: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "channelId", access.DefaultChannelId),
}) })
@ -64,7 +64,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
return pEmail.NewNotifier(&pEmail.NotifierConfig{ return pEmail.NewNotifierProvider(&pEmail.NotifierProviderConfig{
SmtpHost: access.SmtpHost, SmtpHost: access.SmtpHost,
SmtpPort: access.SmtpPort, SmtpPort: access.SmtpPort,
SmtpTls: access.SmtpTls, SmtpTls: access.SmtpTls,
@ -83,7 +83,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
return pLarkBot.NewNotifier(&pLarkBot.NotifierConfig{ return pLarkBot.NewNotifierProvider(&pLarkBot.NotifierProviderConfig{
WebhookUrl: access.WebhookUrl, WebhookUrl: access.WebhookUrl,
}) })
} }
@ -95,7 +95,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
return pMattermost.NewNotifier(&pMattermost.NotifierConfig{ return pMattermost.NewNotifierProvider(&pMattermost.NotifierProviderConfig{
ServerUrl: access.ServerUrl, ServerUrl: access.ServerUrl,
Username: access.Username, Username: access.Username,
Password: access.Password, Password: access.Password,
@ -110,7 +110,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
return pSlackBot.NewNotifier(&pSlackBot.NotifierConfig{ return pSlackBot.NewNotifierProvider(&pSlackBot.NotifierProviderConfig{
BotToken: access.BotToken, BotToken: access.BotToken,
ChannelId: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "channelId", access.DefaultChannelId), ChannelId: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "channelId", access.DefaultChannelId),
}) })
@ -123,7 +123,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
return pTelegramBot.NewNotifier(&pTelegramBot.NotifierConfig{ return pTelegramBot.NewNotifierProvider(&pTelegramBot.NotifierProviderConfig{
BotToken: access.BotToken, BotToken: access.BotToken,
ChatId: xmaps.GetOrDefaultInt64(options.ProviderServiceConfig, "chatId", access.DefaultChatId), ChatId: xmaps.GetOrDefaultInt64(options.ProviderServiceConfig, "chatId", access.DefaultChatId),
}) })
@ -156,7 +156,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
} }
} }
return pWebhook.NewNotifier(&pWebhook.NotifierConfig{ return pWebhook.NewNotifierProvider(&pWebhook.NotifierProviderConfig{
WebhookUrl: access.Url, WebhookUrl: access.Url,
WebhookData: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "webhookData", access.DefaultDataForNotification), WebhookData: xmaps.GetOrDefaultString(options.ProviderServiceConfig, "webhookData", access.DefaultDataForNotification),
Method: access.Method, Method: access.Method,
@ -172,7 +172,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier
return nil, fmt.Errorf("failed to populate provider access config: %w", err) return nil, fmt.Errorf("failed to populate provider access config: %w", err)
} }
return pWeComBot.NewNotifier(&pWeComBot.NotifierConfig{ return pWeComBot.NewNotifierProvider(&pWeComBot.NotifierProviderConfig{
WebhookUrl: access.WebhookUrl, WebhookUrl: access.WebhookUrl,
}) })
} }

28
internal/notify/providers_deprecated.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
pBark "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/bark" pBark "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/bark"
pDingTalk "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalkbot" pDingTalk "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalkbot"
pEmail "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/email" pEmail "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/email"
@ -21,26 +21,26 @@ import (
) )
// Deprecated: v0.4.x 将废弃 // Deprecated: v0.4.x 将废弃
func createNotifierProviderUseGlobalSettings(channel domain.NotifyChannelType, channelConfig map[string]any) (notifier.Notifier, error) { func createNotifierProviderUseGlobalSettings(channel domain.NotifyChannelType, channelConfig map[string]any) (core.Notifier, error) {
/* /*
注意：如果追加新的常量值，请保持以 ASCII 排序。 注意：如果追加新的常量值，请保持以 ASCII 排序。
NOTICE: If you add new constant, please keep ASCII order. NOTICE: If you add new constant, please keep ASCII order.
*/ */
switch channel { switch channel {
case domain.NotifyChannelTypeBark: case domain.NotifyChannelTypeBark:
return pBark.NewNotifier(&pBark.NotifierConfig{ return pBark.NewNotifierProvider(&pBark.NotifierProviderConfig{
DeviceKey: xmaps.GetString(channelConfig, "deviceKey"), DeviceKey: xmaps.GetString(channelConfig, "deviceKey"),
ServerUrl: xmaps.GetString(channelConfig, "serverUrl"), ServerUrl: xmaps.GetString(channelConfig, "serverUrl"),
}) })
case domain.NotifyChannelTypeDingTalk: case domain.NotifyChannelTypeDingTalk:
return pDingTalk.NewNotifier(&pDingTalk.NotifierConfig{ return pDingTalk.NewNotifierProvider(&pDingTalk.NotifierProviderConfig{
WebhookUrl: "https://oapi.dingtalk.com/robot/send?access_token=" + xmaps.GetString(channelConfig, "accessToken"), WebhookUrl: "https://oapi.dingtalk.com/robot/send?access_token=" + xmaps.GetString(channelConfig, "accessToken"),
Secret: xmaps.GetString(channelConfig, "secret"), Secret: xmaps.GetString(channelConfig, "secret"),
}) })
case domain.NotifyChannelTypeEmail: case domain.NotifyChannelTypeEmail:
return pEmail.NewNotifier(&pEmail.NotifierConfig{ return pEmail.NewNotifierProvider(&pEmail.NotifierProviderConfig{
SmtpHost: xmaps.GetString(channelConfig, "smtpHost"), SmtpHost: xmaps.GetString(channelConfig, "smtpHost"),
SmtpPort: xmaps.GetInt32(channelConfig, "smtpPort"), SmtpPort: xmaps.GetInt32(channelConfig, "smtpPort"),
SmtpTls: xmaps.GetOrDefaultBool(channelConfig, "smtpTLS", true), SmtpTls: xmaps.GetOrDefaultBool(channelConfig, "smtpTLS", true),
@ -51,19 +51,19 @@ func createNotifierProviderUseGlobalSettings(channel domain.NotifyChannelType, c
}) })
case domain.NotifyChannelTypeGotify: case domain.NotifyChannelTypeGotify:
return pGotify.NewNotifier(&pGotify.NotifierConfig{ return pGotify.NewNotifierProvider(&pGotify.NotifierProviderConfig{
ServerUrl: xmaps.GetString(channelConfig, "url"), ServerUrl: xmaps.GetString(channelConfig, "url"),
Token: xmaps.GetString(channelConfig, "token"), Token: xmaps.GetString(channelConfig, "token"),
Priority: xmaps.GetOrDefaultInt64(channelConfig, "priority", 1), Priority: xmaps.GetOrDefaultInt64(channelConfig, "priority", 1),
}) })
case domain.NotifyChannelTypeLark: case domain.NotifyChannelTypeLark:
return pLark.NewNotifier(&pLark.NotifierConfig{ return pLark.NewNotifierProvider(&pLark.NotifierProviderConfig{
WebhookUrl: xmaps.GetString(channelConfig, "webhookUrl"), WebhookUrl: xmaps.GetString(channelConfig, "webhookUrl"),
}) })
case domain.NotifyChannelTypeMattermost: case domain.NotifyChannelTypeMattermost:
return pMattermost.NewNotifier(&pMattermost.NotifierConfig{ return pMattermost.NewNotifierProvider(&pMattermost.NotifierProviderConfig{
ServerUrl: xmaps.GetString(channelConfig, "serverUrl"), ServerUrl: xmaps.GetString(channelConfig, "serverUrl"),
ChannelId: xmaps.GetString(channelConfig, "channelId"), ChannelId: xmaps.GetString(channelConfig, "channelId"),
Username: xmaps.GetString(channelConfig, "username"), Username: xmaps.GetString(channelConfig, "username"),
@ -71,35 +71,35 @@ func createNotifierProviderUseGlobalSettings(channel domain.NotifyChannelType, c
}) })
case domain.NotifyChannelTypePushover: case domain.NotifyChannelTypePushover:
return pPushover.NewNotifier(&pPushover.NotifierConfig{ return pPushover.NewNotifierProvider(&pPushover.NotifierProviderConfig{
Token: xmaps.GetString(channelConfig, "token"), Token: xmaps.GetString(channelConfig, "token"),
User: xmaps.GetString(channelConfig, "user"), User: xmaps.GetString(channelConfig, "user"),
}) })
case domain.NotifyChannelTypePushPlus: case domain.NotifyChannelTypePushPlus:
return pPushPlus.NewNotifier(&pPushPlus.NotifierConfig{ return pPushPlus.NewNotifierProvider(&pPushPlus.NotifierProviderConfig{
Token: xmaps.GetString(channelConfig, "token"), Token: xmaps.GetString(channelConfig, "token"),
}) })
case domain.NotifyChannelTypeServerChan: case domain.NotifyChannelTypeServerChan:
return pServerChan.NewNotifier(&pServerChan.NotifierConfig{ return pServerChan.NewNotifierProvider(&pServerChan.NotifierProviderConfig{
ServerUrl: xmaps.GetString(channelConfig, "url"), ServerUrl: xmaps.GetString(channelConfig, "url"),
}) })
case domain.NotifyChannelTypeTelegram: case domain.NotifyChannelTypeTelegram:
return pTelegram.NewNotifier(&pTelegram.NotifierConfig{ return pTelegram.NewNotifierProvider(&pTelegram.NotifierProviderConfig{
BotToken: xmaps.GetString(channelConfig, "apiToken"), BotToken: xmaps.GetString(channelConfig, "apiToken"),
ChatId: xmaps.GetInt64(channelConfig, "chatId"), ChatId: xmaps.GetInt64(channelConfig, "chatId"),
}) })
case domain.NotifyChannelTypeWebhook: case domain.NotifyChannelTypeWebhook:
return pWebhook.NewNotifier(&pWebhook.NotifierConfig{ return pWebhook.NewNotifierProvider(&pWebhook.NotifierProviderConfig{
WebhookUrl: xmaps.GetString(channelConfig, "url"), WebhookUrl: xmaps.GetString(channelConfig, "url"),
AllowInsecureConnections: xmaps.GetBool(channelConfig, "allowInsecureConnections"), AllowInsecureConnections: xmaps.GetBool(channelConfig, "allowInsecureConnections"),
}) })
case domain.NotifyChannelTypeWeCom: case domain.NotifyChannelTypeWeCom:
return pWeCom.NewNotifier(&pWeCom.NotifierConfig{ return pWeCom.NewNotifierProvider(&pWeCom.NotifierProviderConfig{
WebhookUrl: xmaps.GetString(channelConfig, "webhookUrl"), WebhookUrl: xmaps.GetString(channelConfig, "webhookUrl"),
}) })
} }

29
internal/pkg/core/deployer/deployer.go
View File

@ -1,29 +0,0 @@
package deployer
import (
"context"
"log/slog"
)
// 表示定义证书部署器的抽象类型接口。
// 注意与 `Uploader` 区分，“部署”通常为“上传”的后置操作。
type Deployer interface {
WithLogger(logger *slog.Logger) Deployer
// 部署证书。
//
// 入参：
// - ctx：上下文。
// - certPEM：证书 PEM 内容。
// - privkeyPEM：私钥 PEM 内容。
//
// 出参：
// - res：部署结果。
// - err: 错误。
Deploy(ctx context.Context, certPEM string, privkeyPEM string) (_res *DeployResult, _err error)
}
// 表示证书部署结果的数据结构。
type DeployResult struct {
ExtendedData map[string]any `json:"extendedData,omitempty"`
}

74
internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go
View File

@ -1,74 +0,0 @@
package aliyuncas
import (
"context"
"fmt"
"log/slog"
"github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/uploader"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas"
)
type DeployerConfig struct {
// 阿里云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 阿里云 AccessKeySecret。
AccessKeySecret string `json:"accessKeySecret"`
// 阿里云资源组 ID。
ResourceGroupId string `json:"resourceGroupId,omitempty"`
// 阿里云地域。
Region string `json:"region"`
}
type DeployerProvider struct {
config *DeployerConfig
logger *slog.Logger
sslUploader uploader.Uploader
}
var _ deployer.Deployer = (*DeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
if config == nil {
panic("config is nil")
}
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
ResourceGroupId: config.ResourceGroupId,
Region: config.Region,
})
if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err)
}
return &DeployerProvider{
config: config,
logger: slog.Default(),
sslUploader: uploader,
}, nil
}
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer {
if logger == nil {
d.logger = slog.New(slog.DiscardHandler)
} else {
d.logger = logger
}
d.sslUploader.WithLogger(logger)
return d
}
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) {
// 上传证书到 CAS
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM)
if err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
} else {
d.logger.Info("ssl certificate uploaded", slog.Any("result", upres))
}
return &deployer.DeployResult{}, nil
}

75
internal/pkg/core/deployer/providers/aws-iam/aws_iam.go
View File

@ -1,75 +0,0 @@
package awsiam
import (
"context"
"fmt"
"log/slog"
"github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/uploader"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aws-iam"
)
type DeployerConfig struct {
// AWS AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// AWS SecretAccessKey。
SecretAccessKey string `json:"secretAccessKey"`
// AWS 区域。
Region string `json:"region"`
// IAM 证书路径。
// 选填。
CertificatePath string `json:"certificatePath,omitempty"`
}
type DeployerProvider struct {
config *DeployerConfig
logger *slog.Logger
sslUploader uploader.Uploader
}
var _ deployer.Deployer = (*DeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
if config == nil {
panic("config is nil")
}
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
SecretAccessKey: config.SecretAccessKey,
Region: config.Region,
CertificatePath: config.CertificatePath,
})
if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err)
}
return &DeployerProvider{
config: config,
logger: slog.Default(),
sslUploader: uploader,
}, nil
}
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer {
if logger == nil {
d.logger = slog.New(slog.DiscardHandler)
} else {
d.logger = logger
}
d.sslUploader.WithLogger(logger)
return d
}
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) {
// 上传证书到 IAM
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM)
if err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
} else {
d.logger.Info("ssl certificate uploaded", slog.Any("result", upres))
}
return &deployer.DeployResult{}, nil
}

67
internal/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go
View File

@ -1,67 +0,0 @@
package baiducloudcert
import (
"context"
"fmt"
"log/slog"
"github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/uploader"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/baiducloud-cert"
)
type DeployerConfig struct {
// 百度智能云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 百度智能云 SecretAccessKey。
SecretAccessKey string `json:"secretAccessKey"`
}
type DeployerProvider struct {
config *DeployerConfig
logger *slog.Logger
sslUploader uploader.Uploader
}
var _ deployer.Deployer = (*DeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
if config == nil {
panic("config is nil")
}
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
SecretAccessKey: config.SecretAccessKey,
})
if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err)
}
return &DeployerProvider{
config: config,
logger: slog.Default(),
sslUploader: uploader,
}, nil
}
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer {
if logger == nil {
d.logger = slog.New(slog.DiscardHandler)
} else {
d.logger = logger
}
return d
}
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) {
// 上传证书到 CAS
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM)
if err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
} else {
d.logger.Info("ssl certificate uploaded", slog.Any("result", upres))
}
return &deployer.DeployResult{}, nil
}

67
internal/pkg/core/deployer/providers/ctcccloud-cms/ctcccloud_cms.go
View File

@ -1,67 +0,0 @@
package ctcccloudcms
import (
"context"
"fmt"
"log/slog"
"github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/uploader"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/ctcccloud-cms"
)
type DeployerConfig struct {
// 天翼云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 天翼云 SecretAccessKey。
SecretAccessKey string `json:"secretAccessKey"`
}
type DeployerProvider struct {
config *DeployerConfig
logger *slog.Logger
sslUploader uploader.Uploader
}
var _ deployer.Deployer = (*DeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
if config == nil {
panic("config is nil")
}
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
SecretAccessKey: config.SecretAccessKey,
})
if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err)
}
return &DeployerProvider{
config: config,
logger: slog.Default(),
sslUploader: uploader,
}, nil
}
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer {
if logger == nil {
d.logger = slog.New(slog.DiscardHandler)
} else {
d.logger = logger
}
return d
}
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) {
// 上传证书到 CMS
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM)
if err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
} else {
d.logger.Info("ssl certificate uploaded", slog.Any("result", upres))
}
return &deployer.DeployResult{}, nil
}

71
internal/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go
View File

@ -1,71 +0,0 @@
package huaweicloudscm
import (
"context"
"fmt"
"log/slog"
"github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/uploader"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/huaweicloud-scm"
)
type DeployerConfig struct {
// 华为云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 华为云 SecretAccessKey。
SecretAccessKey string `json:"secretAccessKey"`
// 华为云企业项目 ID。
EnterpriseProjectId string `json:"enterpriseProjectId,omitempty"`
}
type DeployerProvider struct {
config *DeployerConfig
logger *slog.Logger
sslUploader uploader.Uploader
}
var _ deployer.Deployer = (*DeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
if config == nil {
panic("config is nil")
}
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
SecretAccessKey: config.SecretAccessKey,
EnterpriseProjectId: config.EnterpriseProjectId,
})
if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err)
}
return &DeployerProvider{
config: config,
logger: slog.Default(),
sslUploader: uploader,
}, nil
}
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer {
if logger == nil {
d.logger = slog.New(slog.DiscardHandler)
} else {
d.logger = logger
}
d.sslUploader.WithLogger(logger)
return d
}
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) {
// 上传证书到 SCM
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM)
if err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
} else {
d.logger.Info("ssl certificate uploaded", slog.Any("result", upres))
}
return &deployer.DeployResult{}, nil
}

68
internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go
View File

@ -1,68 +0,0 @@
package tencentcloudssl
import (
"context"
"fmt"
"log/slog"
"github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/uploader"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl"
)
type DeployerConfig struct {
// 腾讯云 SecretId。
SecretId string `json:"secretId"`
// 腾讯云 SecretKey。
SecretKey string `json:"secretKey"`
}
type DeployerProvider struct {
config *DeployerConfig
logger *slog.Logger
sslUploader uploader.Uploader
}
var _ deployer.Deployer = (*DeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
if config == nil {
panic("config is nil")
}
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})
if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err)
}
return &DeployerProvider{
config: config,
logger: slog.Default(),
sslUploader: uploader,
}, nil
}
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer {
if logger == nil {
d.logger = slog.New(slog.DiscardHandler)
} else {
d.logger = logger
}
d.sslUploader.WithLogger(logger)
return d
}
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) {
// 上传证书到 SSL
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM)
if err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
} else {
d.logger.Info("ssl certificate uploaded", slog.Any("result", upres))
}
return &deployer.DeployResult{}, nil
}

71
internal/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go
View File

@ -1,71 +0,0 @@
package volcenginecertcenter
import (
"context"
"fmt"
"log/slog"
"github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/uploader"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-certcenter"
)
type DeployerConfig struct {
// 火山引擎 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 火山引擎 AccessKeySecret。
AccessKeySecret string `json:"accessKeySecret"`
// 火山引擎地域。
Region string `json:"region"`
}
type DeployerProvider struct {
config *DeployerConfig
logger *slog.Logger
sslUploader uploader.Uploader
}
var _ deployer.Deployer = (*DeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
if config == nil {
panic("config is nil")
}
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
Region: config.Region,
})
if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err)
}
return &DeployerProvider{
config: config,
logger: slog.Default(),
sslUploader: uploader,
}, nil
}
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer {
if logger == nil {
d.logger = slog.New(slog.DiscardHandler)
} else {
d.logger = logger
}
d.sslUploader.WithLogger(logger)
return d
}
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) {
// 上传证书到证书中心
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM)
if err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err)
} else {
d.logger.Info("ssl certificate uploaded", slog.Any("result", upres))
}
return &deployer.DeployResult{}, nil
}

28
internal/pkg/core/notifier/notifier.go
View File

@ -1,28 +0,0 @@
package notifier
import (
"context"
"log/slog"
)
// 表示定义消息通知器的抽象类型接口。
type Notifier interface {
WithLogger(logger *slog.Logger) Notifier
// 发送通知。
//
// 入参：
// - ctx：上下文。
// - subject：通知主题。
// - message：通知内容。
//
// 出参：
// - res：发送结果。
// - err: 错误。
Notify(ctx context.Context, subject string, message string) (_res *NotifyResult, _err error)
}
// 表示通知发送结果的数据结构。
type NotifyResult struct {
ExtendedData map[string]any `json:"extendedData,omitempty"`
}

20
internal/pkg/core/notifier/providers/bark/bark.go
View File

@ -2,15 +2,16 @@ package bark
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// Bark 服务地址。 // Bark 服务地址。
// 零值时使用官方服务器。 // 零值时使用官方服务器。
ServerUrl string `json:"serverUrl"` ServerUrl string `json:"serverUrl"`
@ -19,16 +20,16 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -40,16 +41,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
const defaultServerURL = "https://api.day.app/" const defaultServerURL = "https://api.day.app/"
serverUrl := defaultServerURL serverUrl := defaultServerURL
if n.config.ServerUrl != "" { if n.config.ServerUrl != "" {
@ -72,5 +72,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("bark api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) return nil, fmt.Errorf("bark api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/bark/bark_test.go
View File

@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("DEVICEKEY: %v", fDeviceKey), fmt.Sprintf("DEVICEKEY: %v", fDeviceKey),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
ServerUrl: fServerUrl, ServerUrl: fServerUrl,
DeviceKey: fDeviceKey, DeviceKey: fDeviceKey,
}) })

20
internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go
View File

@ -2,16 +2,17 @@ package dingtalkbot
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"net/url" "net/url"
"github.com/blinkbean/dingtalk" "github.com/blinkbean/dingtalk"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// 钉钉机器人的 Webhook 地址。 // 钉钉机器人的 Webhook 地址。
WebhookUrl string `json:"webhookUrl"` WebhookUrl string `json:"webhookUrl"`
// 钉钉机器人的 Secret。 // 钉钉机器人的 Secret。
@ -19,15 +20,15 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
return &NotifierProvider{ return &NotifierProvider{
@ -36,16 +37,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
webhookUrl, err := url.Parse(n.config.WebhookUrl) webhookUrl, err := url.Parse(n.config.WebhookUrl)
if err != nil { if err != nil {
return nil, fmt.Errorf("dingtalk api error: invalid webhook url: %w", err) return nil, fmt.Errorf("dingtalk api error: invalid webhook url: %w", err)
@ -62,5 +62,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("dingtalk api error: %w", err) return nil, fmt.Errorf("dingtalk api error: %w", err)
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot_test.go
View File

@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("SECRET: %v", fSecret), fmt.Sprintf("SECRET: %v", fSecret),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
WebhookUrl: fWebhookUrl, WebhookUrl: fWebhookUrl,
Secret: fSecret, Secret: fSecret,
}) })

20
internal/pkg/core/notifier/providers/discordbot/discordbot.go
View File

@ -2,15 +2,16 @@ package discordbot
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// Discord Bot API Token。 // Discord Bot API Token。
BotToken string `json:"botToken"` BotToken string `json:"botToken"`
// Discord Channel ID。 // Discord Channel ID。
@ -18,16 +19,16 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -39,16 +40,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
// REF: https://discord.com/developers/docs/resources/message#create-message // REF: https://discord.com/developers/docs/resources/message#create-message
req := n.httpClient.R(). req := n.httpClient.R().
SetContext(ctx). SetContext(ctx).
@ -65,5 +65,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("discord api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) return nil, fmt.Errorf("discord api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/discordbot/discordbot_test.go
View File

@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("CHANNELID: %v", fChannelId), fmt.Sprintf("CHANNELID: %v", fChannelId),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
BotToken: fApiToken, BotToken: fApiToken,
ChannelId: fChannelId, ChannelId: fChannelId,
}) })

20
internal/pkg/core/notifier/providers/email/email.go
View File

@ -3,6 +3,7 @@ package email
import ( import (
"context" "context"
"crypto/tls" "crypto/tls"
"errors"
"log/slog" "log/slog"
"net" "net"
"net/smtp" "net/smtp"
@ -10,10 +11,10 @@ import (
"github.com/domodwyer/mailyak/v3" "github.com/domodwyer/mailyak/v3"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// SMTP 服务器地址。 // SMTP 服务器地址。
SmtpHost string `json:"smtpHost"` SmtpHost string `json:"smtpHost"`
// SMTP 服务器端口。 // SMTP 服务器端口。
@ -34,15 +35,15 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
return &NotifierProvider{ return &NotifierProvider{
@ -51,16 +52,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
var smtpAuth smtp.Auth var smtpAuth smtp.Auth
if n.config.Username != "" || n.config.Password != "" { if n.config.Username != "" || n.config.Password != "" {
smtpAuth = smtp.PlainAuth("", n.config.Username, n.config.Password, n.config.SmtpHost) smtpAuth = smtp.PlainAuth("", n.config.Username, n.config.Password, n.config.SmtpHost)
@ -98,7 +98,7 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, err return nil, err
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }
func newTlsConfig() *tls.Config { func newTlsConfig() *tls.Config {

2
internal/pkg/core/notifier/providers/email/email_test.go
View File

@ -64,7 +64,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("RECEIVERADDRESS: %v", fReceiverAddress), fmt.Sprintf("RECEIVERADDRESS: %v", fReceiverAddress),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
SmtpHost: fSmtpHost, SmtpHost: fSmtpHost,
SmtpPort: int32(fSmtpPort), SmtpPort: int32(fSmtpPort),
SmtpTls: fSmtpTLS, SmtpTls: fSmtpTLS,

20
internal/pkg/core/notifier/providers/gotify/gotify.go
View File

@ -2,16 +2,17 @@ package gotify
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"strings" "strings"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// Gotify 服务地址。 // Gotify 服务地址。
ServerUrl string `json:"serverUrl"` ServerUrl string `json:"serverUrl"`
// Gotify Token。 // Gotify Token。
@ -21,16 +22,16 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -42,16 +43,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
serverUrl := strings.TrimRight(n.config.ServerUrl, "/") serverUrl := strings.TrimRight(n.config.ServerUrl, "/")
// REF: https://gotify.net/api-docs#/message/createMessage // REF: https://gotify.net/api-docs#/message/createMessage
@ -72,5 +72,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("gotify api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) return nil, fmt.Errorf("gotify api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/gotify/gotify_test.go
View File

@ -47,7 +47,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("PRIORITY: %d", fPriority), fmt.Sprintf("PRIORITY: %d", fPriority),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
ServerUrl: fUrl, ServerUrl: fUrl,
Token: fToken, Token: fToken,
Priority: fPriority, Priority: fPriority,

20
internal/pkg/core/notifier/providers/larkbot/larkbot.go
View File

@ -2,29 +2,30 @@ package larkbot
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-lark/lark" "github.com/go-lark/lark"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// 飞书机器人 Webhook 地址。 // 飞书机器人 Webhook 地址。
WebhookUrl string `json:"webhookUrl"` WebhookUrl string `json:"webhookUrl"`
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
return &NotifierProvider{ return &NotifierProvider{
@ -33,16 +34,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
bot := lark.NewNotificationBot(n.config.WebhookUrl) bot := lark.NewNotificationBot(n.config.WebhookUrl)
content := lark.NewPostBuilder(). content := lark.NewPostBuilder().
Title(subject). Title(subject).
@ -56,5 +56,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("lark api error: code='%d', message='%s'", resp.Code, resp.Msg) return nil, fmt.Errorf("lark api error: code='%d', message='%s'", resp.Code, resp.Msg)
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/larkbot/larkbot_test.go
View File

@ -38,7 +38,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("WEBHOOKURL: %v", fWebhookUrl), fmt.Sprintf("WEBHOOKURL: %v", fWebhookUrl),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
WebhookUrl: fWebhookUrl, WebhookUrl: fWebhookUrl,
}) })
if err != nil { if err != nil {

20
internal/pkg/core/notifier/providers/mattermost/mattermost.go
View File

@ -2,16 +2,17 @@ package mattermost
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"strings" "strings"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// Mattermost 服务地址。 // Mattermost 服务地址。
ServerUrl string `json:"serverUrl"` ServerUrl string `json:"serverUrl"`
// Mattermost 用户名。 // Mattermost 用户名。
@ -23,16 +24,16 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -44,16 +45,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
serverUrl := strings.TrimRight(n.config.ServerUrl, "/") serverUrl := strings.TrimRight(n.config.ServerUrl, "/")
// REF: https://developers.mattermost.com/api-documentation/#/operations/Login // REF: https://developers.mattermost.com/api-documentation/#/operations/Login
@ -98,5 +98,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("mattermost api error: unexpected status code: %d, resp: %s", postResp.StatusCode(), postResp.String()) return nil, fmt.Errorf("mattermost api error: unexpected status code: %d, resp: %s", postResp.StatusCode(), postResp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/mattermost/mattermost_test.go
View File

@ -52,7 +52,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("PASSWORD: %v", fPassword), fmt.Sprintf("PASSWORD: %v", fPassword),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
ServerUrl: fServerUrl, ServerUrl: fServerUrl,
ChannelId: fChannelId, ChannelId: fChannelId,
Username: fUsername, Username: fUsername,

20
internal/pkg/core/notifier/providers/pushover/pushover.go
View File

@ -2,15 +2,16 @@ package pushover
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// Pushover API Token。 // Pushover API Token。
Token string `json:"token"` Token string `json:"token"`
// 用户或分组标识。 // 用户或分组标识。
@ -18,16 +19,16 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -39,16 +40,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
// REF: https://pushover.net/api // REF: https://pushover.net/api
req := n.httpClient.R(). req := n.httpClient.R().
SetContext(ctx). SetContext(ctx).
@ -67,5 +67,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("pushover api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) return nil, fmt.Errorf("pushover api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/pushover/pushover_test.go
View File

@ -42,7 +42,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("TOKEN: %v", fToken), fmt.Sprintf("TOKEN: %v", fToken),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
Token: fToken, Token: fToken,
User: fUser, User: fUser,
}) })

20
internal/pkg/core/notifier/providers/pushplus/pushplus.go
View File

@ -3,30 +3,31 @@ package pushplus
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// PushPlus Token。 // PushPlus Token。
Token string `json:"token"` Token string `json:"token"`
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -38,16 +39,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
// REF: https://pushplus.plus/doc/guide/api.html#%E4%B8%80%E3%80%81%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF%E6%8E%A5%E5%8F%A3 // REF: https://pushplus.plus/doc/guide/api.html#%E4%B8%80%E3%80%81%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF%E6%8E%A5%E5%8F%A3
req := n.httpClient.R(). req := n.httpClient.R().
SetContext(ctx). SetContext(ctx).
@ -75,5 +75,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("pushplus api error: code='%d', message='%s'", errorResponse.Code, errorResponse.Message) return nil, fmt.Errorf("pushplus api error: code='%d', message='%s'", errorResponse.Code, errorResponse.Message)
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/pushplus/pushplus_test.go
View File

@ -37,7 +37,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("TOKEN: %v", fToken), fmt.Sprintf("TOKEN: %v", fToken),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
Token: fToken, Token: fToken,
}) })
if err != nil { if err != nil {

20
internal/pkg/core/notifier/providers/serverchan/serverchan.go
View File

@ -2,30 +2,31 @@ package serverchan
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// ServerChan 服务地址。 // ServerChan 服务地址。
ServerUrl string `json:"serverUrl"` ServerUrl string `json:"serverUrl"`
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -37,16 +38,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
// REF: https://sct.ftqq.com/ // REF: https://sct.ftqq.com/
req := n.httpClient.R(). req := n.httpClient.R().
SetContext(ctx). SetContext(ctx).
@ -63,5 +63,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("serverchan api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) return nil, fmt.Errorf("serverchan api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/serverchan/serverchan_test.go
View File

@ -38,7 +38,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("URL: %v", fUrl), fmt.Sprintf("URL: %v", fUrl),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
ServerUrl: fUrl, ServerUrl: fUrl,
}) })
if err != nil { if err != nil {

20
internal/pkg/core/notifier/providers/slackbot/slackbot.go
View File

@ -2,15 +2,16 @@ package discordbot
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// Slack Bot API Token。 // Slack Bot API Token。
BotToken string `json:"botToken"` BotToken string `json:"botToken"`
// Slack Channel ID。 // Slack Channel ID。
@ -18,16 +19,16 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -39,16 +40,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
// REF: https://docs.slack.dev/messaging/sending-and-scheduling-messages#publishing // REF: https://docs.slack.dev/messaging/sending-and-scheduling-messages#publishing
req := n.httpClient.R(). req := n.httpClient.R().
SetContext(ctx). SetContext(ctx).
@ -67,5 +67,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("slack api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) return nil, fmt.Errorf("slack api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/slackbot/slackbot_test.go
View File

@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("CHANNELID: %v", fChannelId), fmt.Sprintf("CHANNELID: %v", fChannelId),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
BotToken: fApiToken, BotToken: fApiToken,
ChannelId: fChannelId, ChannelId: fChannelId,
}) })

20
internal/pkg/core/notifier/providers/telegrambot/telegrambot.go
View File

@ -2,15 +2,16 @@ package telegrambot
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// Telegram Bot API Token。 // Telegram Bot API Token。
BotToken string `json:"botToken"` BotToken string `json:"botToken"`
// Telegram Chat ID。 // Telegram Chat ID。
@ -18,16 +19,16 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -39,16 +40,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
// REF: https://core.telegram.org/bots/api#sendmessage // REF: https://core.telegram.org/bots/api#sendmessage
req := n.httpClient.R(). req := n.httpClient.R().
SetContext(ctx). SetContext(ctx).
@ -65,5 +65,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("telegram api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) return nil, fmt.Errorf("telegram api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/telegrambot/telegrambot_test.go
View File

@ -44,7 +44,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("CHATID: %v", fChatId), fmt.Sprintf("CHATID: %v", fChatId),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
BotToken: fApiToken, BotToken: fApiToken,
ChatId: fChatId, ChatId: fChatId,
}) })

20
internal/pkg/core/notifier/providers/webhook/webhook.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"net/http" "net/http"
@ -13,10 +14,10 @@ import (
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// Webhook URL。 // Webhook URL。
WebhookUrl string `json:"webhookUrl"` WebhookUrl string `json:"webhookUrl"`
// Webhook 回调数据（application/json 或 application/x-www-form-urlencoded 格式）。 // Webhook 回调数据（application/json 或 application/x-www-form-urlencoded 格式）。
@ -31,16 +32,16 @@ type NotifierConfig struct {
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New(). client := resty.New().
@ -58,16 +59,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
// 处理 Webhook URL // 处理 Webhook URL
webhookUrl, err := url.Parse(n.config.WebhookUrl) webhookUrl, err := url.Parse(n.config.WebhookUrl)
if err != nil { if err != nil {
@ -165,7 +165,7 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
n.logger.Debug("webhook responded", slog.String("response", resp.String())) n.logger.Debug("webhook responded", slog.String("response", resp.String()))
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }
func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} { func replaceJsonValueRecursively(data interface{}, oldStr, newStr string) interface{} {

2
internal/pkg/core/notifier/providers/webhook/webhook_test.go
View File

@ -43,7 +43,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("URL: %v", fWebhookUrl), fmt.Sprintf("URL: %v", fWebhookUrl),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
WebhookUrl: fWebhookUrl, WebhookUrl: fWebhookUrl,
Method: "POST", Method: "POST",
Headers: map[string]string{ Headers: map[string]string{

20
internal/pkg/core/notifier/providers/wecombot/wecombot.go
View File

@ -2,30 +2,31 @@ package wecombot
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/usual2970/certimate/internal/pkg/core/notifier" "github.com/usual2970/certimate/internal/pkg/core"
) )
type NotifierConfig struct { type NotifierProviderConfig struct {
// 企业微信机器人 Webhook 地址。 // 企业微信机器人 Webhook 地址。
WebhookUrl string `json:"webhookUrl"` WebhookUrl string `json:"webhookUrl"`
} }
type NotifierProvider struct { type NotifierProvider struct {
config *NotifierConfig config *NotifierProviderConfig
logger *slog.Logger logger *slog.Logger
httpClient *resty.Client httpClient *resty.Client
} }
var _ notifier.Notifier = (*NotifierProvider)(nil) var _ core.Notifier = (*NotifierProvider)(nil)
func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) { func NewNotifierProvider(config *NotifierProviderConfig) (*NotifierProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the notifier provider is nil")
} }
client := resty.New() client := resty.New()
@ -37,16 +38,15 @@ func NewNotifier(config *NotifierConfig) (*NotifierProvider, error) {
}, nil }, nil
} }
func (n *NotifierProvider) WithLogger(logger *slog.Logger) notifier.Notifier { func (n *NotifierProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
n.logger = slog.New(slog.DiscardHandler) n.logger = slog.New(slog.DiscardHandler)
} else { } else {
n.logger = logger n.logger = logger
} }
return n
} }
func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*notifier.NotifyResult, error) { func (n *NotifierProvider) Notify(ctx context.Context, subject string, message string) (*core.NotifyResult, error) {
// REF: https://developer.work.weixin.qq.com/document/path/91770 // REF: https://developer.work.weixin.qq.com/document/path/91770
req := n.httpClient.R(). req := n.httpClient.R().
SetContext(ctx). SetContext(ctx).
@ -65,5 +65,5 @@ func (n *NotifierProvider) Notify(ctx context.Context, subject string, message s
return nil, fmt.Errorf("wecom api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String()) return nil, fmt.Errorf("wecom api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
} }
return &notifier.NotifyResult{}, nil return &core.NotifyResult{}, nil
} }

2
internal/pkg/core/notifier/providers/wecombot/wecombot_test.go
View File

@ -38,7 +38,7 @@ func TestNotify(t *testing.T) {
fmt.Sprintf("WEBHOOKURL: %v", fWebhookUrl), fmt.Sprintf("WEBHOOKURL: %v", fWebhookUrl),
}, "\n")) }, "\n"))
notifier, err := provider.NewNotifier(&provider.NotifierConfig{ notifier, err := provider.NewNotifierProvider(&provider.NotifierProviderConfig{
WebhookUrl: fWebhookUrl, WebhookUrl: fWebhookUrl,
}) })
if err != nil { if err != nil {

8
internal/pkg/core/applicator/acme-dns01/lego-providers/acmehttpreq/acmehttpreq.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/acmehttpreq/acmehttpreq.go
View File

@ -1,11 +1,13 @@
package acmehttpreq package acmehttpreq
import ( import (
"errors"
"net/url" "net/url"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/httpreq" "github.com/go-acme/lego/v4/providers/dns/httpreq"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -16,9 +18,9 @@ type ChallengeProviderConfig struct {
DnsPropagationTimeout int32 `json:"dnsPropagationTimeout,omitempty"` DnsPropagationTimeout int32 `json:"dnsPropagationTimeout,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
endpoint, _ := url.Parse(config.Endpoint) endpoint, _ := url.Parse(config.Endpoint)

10
internal/pkg/core/applicator/acme-dns01/lego-providers/aliyun-esa/aliyun_esa.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/aliyun-esa/aliyun_esa.go
View File

@ -1,11 +1,11 @@
package aliyunesa package aliyunesa
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/aliyun-esa/internal"
internal "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/aliyun-esa/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -16,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := internal.NewDefaultConfig() providerConfig := internal.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/aliyun-esa/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/aliyun-esa/internal/lego.go
View File

8
internal/pkg/core/applicator/acme-dns01/lego-providers/aliyun/aliyun.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/aliyun/aliyun.go
View File

@ -1,10 +1,12 @@
package aliyun package aliyun
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/alidns" "github.com/go-acme/lego/v4/providers/dns/alidns"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := alidns.NewDefaultConfig() providerConfig := alidns.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/aws-route53/aws-route53.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/aws-route53/aws-route53.go
View File

@ -1,10 +1,12 @@
package awsroute53 package awsroute53
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/route53" "github.com/go-acme/lego/v4/providers/dns/route53"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -16,9 +18,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := route53.NewDefaultConfig() providerConfig := route53.NewDefaultConfig()

7
internal/pkg/core/applicator/acme-dns01/lego-providers/azure-dns/azure-dns.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/azure-dns/azure-dns.go
View File

@ -1,11 +1,12 @@
package azuredns package azuredns
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/azuredns" "github.com/go-acme/lego/v4/providers/dns/azuredns"
"github.com/usual2970/certimate/internal/pkg/core"
azenv "github.com/usual2970/certimate/internal/pkg/sdk3rd/azure/env" azenv "github.com/usual2970/certimate/internal/pkg/sdk3rd/azure/env"
) )
@ -18,9 +19,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := azuredns.NewDefaultConfig() providerConfig := azuredns.NewDefaultConfig()

10
internal/pkg/core/applicator/acme-dns01/lego-providers/baiducloud/baiducloud.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/baiducloud/baiducloud.go
View File

@ -1,11 +1,11 @@
package baiducloud package baiducloud
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/baiducloud/internal"
internal "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/baiducloud/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -15,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := internal.NewDefaultConfig() providerConfig := internal.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/baiducloud/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/baiducloud/internal/lego.go
View File

8
internal/pkg/core/applicator/acme-dns01/lego-providers/bunny/bunny.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/bunny/bunny.go
View File

@ -1,10 +1,12 @@
package bunny package bunny
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/bunny" "github.com/go-acme/lego/v4/providers/dns/bunny"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := bunny.NewDefaultConfig() providerConfig := bunny.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/cloudflare/cloudflare.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/cloudflare/cloudflare.go
View File

@ -1,10 +1,12 @@
package cloudflare package cloudflare
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/cloudflare" "github.com/go-acme/lego/v4/providers/dns/cloudflare"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := cloudflare.NewDefaultConfig() providerConfig := cloudflare.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/cloudns/cloudns.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/cloudns/cloudns.go
View File

@ -1,10 +1,12 @@
package cloudns package cloudns
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/cloudns" "github.com/go-acme/lego/v4/providers/dns/cloudns"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := cloudns.NewDefaultConfig() providerConfig := cloudns.NewDefaultConfig()

10
internal/pkg/core/applicator/acme-dns01/lego-providers/cmcccloud/cmcccloud.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/cmcccloud/cmcccloud.go
View File

@ -1,11 +1,11 @@
package cmcccloud package cmcccloud
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/cmcccloud/internal"
"github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/cmcccloud/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -15,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := internal.NewDefaultConfig() providerConfig := internal.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/cmcccloud/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/cmcccloud/internal/lego.go
View File

8
internal/pkg/core/applicator/acme-dns01/lego-providers/constellix/constellix.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/constellix/constellix.go
View File

@ -1,10 +1,12 @@
package cloudns package cloudns
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/constellix" "github.com/go-acme/lego/v4/providers/dns/constellix"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := constellix.NewDefaultConfig() providerConfig := constellix.NewDefaultConfig()

10
internal/pkg/core/applicator/acme-dns01/lego-providers/ctcccloud/ctcccloud.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/ctcccloud/ctcccloud.go
View File

@ -1,11 +1,11 @@
package ctcccloud package ctcccloud
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/ctcccloud/internal"
"github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/ctcccloud/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -15,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := internal.NewDefaultConfig() providerConfig := internal.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/ctcccloud/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/ctcccloud/internal/lego.go
View File

8
internal/pkg/core/applicator/acme-dns01/lego-providers/desec/desec.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/desec/desec.go
View File

@ -1,10 +1,12 @@
package desec package desec
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/desec" "github.com/go-acme/lego/v4/providers/dns/desec"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := desec.NewDefaultConfig() providerConfig := desec.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/digitalocean/digitalocean.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/digitalocean/digitalocean.go
View File

@ -1,10 +1,12 @@
package namedotcom package namedotcom
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/digitalocean" "github.com/go-acme/lego/v4/providers/dns/digitalocean"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := digitalocean.NewDefaultConfig() providerConfig := digitalocean.NewDefaultConfig()

10
internal/pkg/core/applicator/acme-dns01/lego-providers/dnsla/dnsla.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/dnsla/dnsla.go
View File

@ -1,11 +1,11 @@
package dnsla package dnsla
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/dnsla/internal"
internal "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/dnsla/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -15,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := internal.NewDefaultConfig() providerConfig := internal.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/dnsla/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/dnsla/internal/lego.go
View File

8
internal/pkg/core/applicator/acme-dns01/lego-providers/duckdns/duckdns.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/duckdns/duckdns.go
View File

@ -1,10 +1,12 @@
package namedotcom package namedotcom
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/duckdns" "github.com/go-acme/lego/v4/providers/dns/duckdns"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -12,9 +14,9 @@ type ChallengeProviderConfig struct {
DnsPropagationTimeout int32 `json:"dnsPropagationTimeout,omitempty"` DnsPropagationTimeout int32 `json:"dnsPropagationTimeout,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := duckdns.NewDefaultConfig() providerConfig := duckdns.NewDefaultConfig()

10
internal/pkg/core/applicator/acme-dns01/lego-providers/dynv6/dnsla.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/dynv6/dnsla.go
View File

@ -1,11 +1,11 @@
package dynv6 package dynv6
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/dynv6/internal"
internal "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/dynv6/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +14,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := internal.NewDefaultConfig() providerConfig := internal.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/dynv6/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/dynv6/internal/lego.go
View File

8
internal/pkg/core/applicator/acme-dns01/lego-providers/gcore/gcore.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/gcore/gcore.go
View File

@ -1,10 +1,12 @@
package gcore package gcore
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/gcore" "github.com/go-acme/lego/v4/providers/dns/gcore"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := gcore.NewDefaultConfig() providerConfig := gcore.NewDefaultConfig()

10
internal/pkg/core/applicator/acme-dns01/lego-providers/gname/gname.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/gname/gname.go
View File

@ -1,11 +1,11 @@
package gname package gname
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/gname/internal"
internal "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/gname/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -15,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := internal.NewDefaultConfig() providerConfig := internal.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/gname/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/gname/internal/lego.go
View File

8
internal/pkg/core/applicator/acme-dns01/lego-providers/godaddy/godaddy.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/godaddy/godaddy.go
View File

@ -1,10 +1,12 @@
package godaddy package godaddy
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/godaddy" "github.com/go-acme/lego/v4/providers/dns/godaddy"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := godaddy.NewDefaultConfig() providerConfig := godaddy.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/hetzner/hetzner.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/hetzner/hetzner.go
View File

@ -1,10 +1,12 @@
package namedotcom package namedotcom
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/hetzner" "github.com/go-acme/lego/v4/providers/dns/hetzner"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := hetzner.NewDefaultConfig() providerConfig := hetzner.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/huaweicloud/huaweicloud.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/huaweicloud/huaweicloud.go
View File

@ -1,10 +1,12 @@
package huaweicloud package huaweicloud
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
hwc "github.com/go-acme/lego/v4/providers/dns/huaweicloud" hwc "github.com/go-acme/lego/v4/providers/dns/huaweicloud"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -15,9 +17,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
region := config.Region region := config.Region

0
internal/pkg/core/applicator/acme-dns01/lego-providers/jdcloud/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/jdcloud/internal/lego.go
View File

10
internal/pkg/core/applicator/acme-dns01/lego-providers/jdcloud/jdcloud.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/jdcloud/jdcloud.go
View File

@ -1,11 +1,11 @@
package jdcloud package jdcloud
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/jdcloud/internal"
internal "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/jdcloud/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -16,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
regionId := config.RegionId regionId := config.RegionId

8
internal/pkg/core/applicator/acme-dns01/lego-providers/namecheap/namecheap.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/namecheap/namecheap.go
View File

@ -1,10 +1,12 @@
package namedotcom package namedotcom
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/namecheap" "github.com/go-acme/lego/v4/providers/dns/namecheap"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := namecheap.NewDefaultConfig() providerConfig := namecheap.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/namedotcom/namedotcom.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/namedotcom/namedotcom.go
View File

@ -1,10 +1,12 @@
package namedotcom package namedotcom
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/namedotcom" "github.com/go-acme/lego/v4/providers/dns/namedotcom"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := namedotcom.NewDefaultConfig() providerConfig := namedotcom.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/namesilo/namesilo.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/namesilo/namesilo.go
View File

@ -1,10 +1,12 @@
package namesilo package namesilo
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/namesilo" "github.com/go-acme/lego/v4/providers/dns/namesilo"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := namesilo.NewDefaultConfig() providerConfig := namesilo.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/netcup/netcup.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/netcup/netcup.go
View File

@ -1,10 +1,12 @@
package netcup package netcup
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/netcup" "github.com/go-acme/lego/v4/providers/dns/netcup"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -15,9 +17,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := netcup.NewDefaultConfig() providerConfig := netcup.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/netlify/netlify.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/netlify/netlify.go
View File

@ -1,10 +1,12 @@
package netcup package netcup
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/netlify" "github.com/go-acme/lego/v4/providers/dns/netlify"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := netlify.NewDefaultConfig() providerConfig := netlify.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/ns1/ns1.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/ns1/ns1.go
View File

@ -1,10 +1,12 @@
package ns1 package ns1
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/ns1" "github.com/go-acme/lego/v4/providers/dns/ns1"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := ns1.NewDefaultConfig() providerConfig := ns1.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/porkbun/porkbun.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/porkbun/porkbun.go
View File

@ -1,10 +1,12 @@
package porkbun package porkbun
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/porkbun" "github.com/go-acme/lego/v4/providers/dns/porkbun"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := porkbun.NewDefaultConfig() providerConfig := porkbun.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/powerdns/powerdns.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/powerdns/powerdns.go
View File

@ -2,12 +2,14 @@ package powerdns
import ( import (
"crypto/tls" "crypto/tls"
"errors"
"net/http" "net/http"
"net/url" "net/url"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/pdns" "github.com/go-acme/lego/v4/providers/dns/pdns"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -18,9 +20,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
serverUrl, _ := url.Parse(config.ServerUrl) serverUrl, _ := url.Parse(config.ServerUrl)

8
internal/pkg/core/applicator/acme-dns01/lego-providers/rainyun/rainyun.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/rainyun/rainyun.go
View File

@ -1,10 +1,12 @@
package rainyun package rainyun
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/rainyun" "github.com/go-acme/lego/v4/providers/dns/rainyun"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -13,9 +15,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := rainyun.NewDefaultConfig() providerConfig := rainyun.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/tencentcloud-eo/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/tencentcloud-eo/internal/lego.go
View File

10
internal/pkg/core/applicator/acme-dns01/lego-providers/tencentcloud-eo/tencentcloud_eo.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/tencentcloud-eo/tencentcloud_eo.go
View File

@ -1,11 +1,11 @@
package tencentcloudeo package tencentcloudeo
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/tencentcloud-eo/internal"
internal "github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/tencentcloud-eo/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -16,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := internal.NewDefaultConfig() providerConfig := internal.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/tencentcloud/tencentcloud.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/tencentcloud/tencentcloud.go
View File

@ -1,10 +1,12 @@
package tencentcloud package tencentcloud
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/tencentcloud" "github.com/go-acme/lego/v4/providers/dns/tencentcloud"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := tencentcloud.NewDefaultConfig() providerConfig := tencentcloud.NewDefaultConfig()

0
internal/pkg/core/applicator/acme-dns01/lego-providers/ucloud-udnr/internal/lego.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/ucloud-udnr/internal/lego.go
View File

7
internal/pkg/core/applicator/acme-dns01/lego-providers/ucloud-udnr/ucloud_udnr.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/ucloud-udnr/ucloud_udnr.go
View File

@ -4,9 +4,8 @@ import (
"errors" "errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/ssl-applicator/acme-dns01/providers/ucloud-udnr/internal"
"github.com/usual2970/certimate/internal/pkg/core/applicator/acme-dns01/lego-providers/ucloud-udnr/internal"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -16,7 +15,7 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
return nil, errors.New("config is nil") return nil, errors.New("config is nil")
} }

8
internal/pkg/core/applicator/acme-dns01/lego-providers/vercel/vercel.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/vercel/vercel.go
View File

@ -1,10 +1,12 @@
package vercel package vercel
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/vercel" "github.com/go-acme/lego/v4/providers/dns/vercel"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := vercel.NewDefaultConfig() providerConfig := vercel.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/volcengine/volcengine.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/volcengine/volcengine.go
View File

@ -1,10 +1,12 @@
package volcengine package volcengine
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/volcengine" "github.com/go-acme/lego/v4/providers/dns/volcengine"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := volcengine.NewDefaultConfig() providerConfig := volcengine.NewDefaultConfig()

8
internal/pkg/core/applicator/acme-dns01/lego-providers/westcn/westcn.go → internal/pkg/core/ssl-applicator/acme-dns01/providers/westcn/westcn.go
View File

@ -1,10 +1,12 @@
package westcn package westcn
import ( import (
"errors"
"time" "time"
"github.com/go-acme/lego/v4/challenge"
"github.com/go-acme/lego/v4/providers/dns/westcn" "github.com/go-acme/lego/v4/providers/dns/westcn"
"github.com/usual2970/certimate/internal/pkg/core"
) )
type ChallengeProviderConfig struct { type ChallengeProviderConfig struct {
@ -14,9 +16,9 @@ type ChallengeProviderConfig struct {
DnsTTL int32 `json:"dnsTTL,omitempty"` DnsTTL int32 `json:"dnsTTL,omitempty"`
} }
func NewChallengeProvider(config *ChallengeProviderConfig) (challenge.Provider, error) { func NewChallengeProvider(config *ChallengeProviderConfig) (core.ACMEChallenger, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the acme challenge provider is nil")
} }
providerConfig := westcn.NewDefaultConfig() providerConfig := westcn.NewDefaultConfig()

30
internal/pkg/core/deployer/providers/1panel-console/1panel_console.go → internal/pkg/core/ssl-deployer/providers/1panel-console/1panel_console.go
View File

@ -3,16 +3,17 @@ package onepanelconsole
import ( import (
"context" "context"
"crypto/tls" "crypto/tls"
"errors"
"fmt" "fmt"
"log/slog" "log/slog"
"strconv" "strconv"
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core"
onepanelsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel" onepanelsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel"
onepanelsdkv2 "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel/v2" onepanelsdkv2 "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel/v2"
) )
type DeployerConfig struct { type SSLDeployerProviderConfig struct {
// 1Panel 服务地址。 // 1Panel 服务地址。
ServerUrl string `json:"serverUrl"` ServerUrl string `json:"serverUrl"`
// 1Panel 版本。 // 1Panel 版本。
@ -26,41 +27,40 @@ type DeployerConfig struct {
AutoRestart bool `json:"autoRestart"` AutoRestart bool `json:"autoRestart"`
} }
type DeployerProvider struct { type SSLDeployerProvider struct {
config *DeployerConfig config *SSLDeployerProviderConfig
logger *slog.Logger logger *slog.Logger
sdkClient any sdkClient any
} }
var _ deployer.Deployer = (*DeployerProvider)(nil) var _ core.SSLDeployer = (*SSLDeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { func NewSSLDeployerProvider(config *SSLDeployerProviderConfig) (*SSLDeployerProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the ssl deployer provider is nil")
} }
client, err := createSdkClient(config.ServerUrl, config.ApiVersion, config.ApiKey, config.AllowInsecureConnections) client, err := createSDKClient(config.ServerUrl, config.ApiVersion, config.ApiKey, config.AllowInsecureConnections)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create sdk client: %w", err) return nil, fmt.Errorf("could not create sdk client: %w", err)
} }
return &DeployerProvider{ return &SSLDeployerProvider{
config: config, config: config,
logger: slog.Default(), logger: slog.Default(),
sdkClient: client, sdkClient: client,
}, nil }, nil
} }
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { func (d *SSLDeployerProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
d.logger = slog.New(slog.DiscardHandler) d.logger = slog.New(slog.DiscardHandler)
} else { } else {
d.logger = logger d.logger = logger
} }
return d
} }
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) { func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*core.SSLDeployResult, error) {
// 设置面板 SSL 证书 // 设置面板 SSL 证书
switch sdkClient := d.sdkClient.(type) { switch sdkClient := d.sdkClient.(type) {
case *onepanelsdk.Client: case *onepanelsdk.Client:
@ -99,7 +99,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE
panic("sdk client is not implemented") panic("sdk client is not implemented")
} }
return &deployer.DeployResult{}, nil return &core.SSLDeployResult{}, nil
} }
const ( const (
@ -107,7 +107,7 @@ const (
sdkVersionV2 = "v2" sdkVersionV2 = "v2"
) )
func createSdkClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool) (any, error) { func createSDKClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool) (any, error) {
if apiVersion == sdkVersionV1 { if apiVersion == sdkVersionV1 {
client, err := onepanelsdk.NewClient(serverUrl, apiKey) client, err := onepanelsdk.NewClient(serverUrl, apiKey)
if err != nil { if err != nil {

16
internal/pkg/core/deployer/providers/1panel-console/1panel_console_test.go → internal/pkg/core/ssl-deployer/providers/1panel-console/1panel_console_test.go
View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"testing" "testing"
provider "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/1panel-console" provider "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/1panel-console"
) )
var ( var (
@ -20,7 +20,7 @@ var (
) )
func init() { func init() {
argsPrefix := "CERTIMATE_DEPLOYER_1PANELCONSOLE_" argsPrefix := "CERTIMATE_SSLDEPLOYER_1PANELCONSOLE_"
flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "")
flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "")
@ -33,11 +33,11 @@ func init() {
Shell command to run this test: Shell command to run this test:
go test -v ./1panel_console_test.go -args \ go test -v ./1panel_console_test.go -args \
--CERTIMATE_DEPLOYER_1PANELCONSOLE_INPUTCERTPATH="/path/to/your-input-cert.pem" \ --CERTIMATE_SSLDEPLOYER_1PANELCONSOLE_INPUTCERTPATH="/path/to/your-input-cert.pem" \
--CERTIMATE_DEPLOYER_1PANELCONSOLE_INPUTKEYPATH="/path/to/your-input-key.pem" \ --CERTIMATE_SSLDEPLOYER_1PANELCONSOLE_INPUTKEYPATH="/path/to/your-input-key.pem" \
--CERTIMATE_DEPLOYER_1PANELCONSOLE_SERVERURL="http://127.0.0.1:20410" \ --CERTIMATE_SSLDEPLOYER_1PANELCONSOLE_SERVERURL="http://127.0.0.1:20410" \
--CERTIMATE_DEPLOYER_1PANELCONSOLE_APIVERSION="v1" \ --CERTIMATE_SSLDEPLOYER_1PANELCONSOLE_APIVERSION="v1" \
--CERTIMATE_DEPLOYER_1PANELCONSOLE_APIKEY="your-api-key" --CERTIMATE_SSLDEPLOYER_1PANELCONSOLE_APIKEY="your-api-key"
*/ */
func TestDeploy(t *testing.T) { func TestDeploy(t *testing.T) {
flag.Parse() flag.Parse()
@ -52,7 +52,7 @@ func TestDeploy(t *testing.T) {
fmt.Sprintf("APIKEY: %v", fApiKey), fmt.Sprintf("APIKEY: %v", fApiKey),
}, "\n")) }, "\n"))
deployer, err := provider.NewDeployer(&provider.DeployerConfig{ deployer, err := provider.NewSSLDeployerProvider(&provider.SSLDeployerProviderConfig{
ServerUrl: fServerUrl, ServerUrl: fServerUrl,
ApiVersion: fApiVersion, ApiVersion: fApiVersion,
ApiKey: fApiKey, ApiKey: fApiKey,

51
internal/pkg/core/deployer/providers/1panel-site/1panel_site.go → internal/pkg/core/ssl-deployer/providers/1panel-site/1panel_site.go
View File

@ -8,14 +8,13 @@ import (
"log/slog" "log/slog"
"strconv" "strconv"
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/uploader" sslmgrsp "github.com/usual2970/certimate/internal/pkg/core/ssl-manager/providers/1panel-ssl"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/1panel-ssl"
onepanelsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel" onepanelsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel"
onepanelsdkv2 "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel/v2" onepanelsdkv2 "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel/v2"
) )
type DeployerConfig struct { type SSLDeployerProviderConfig struct {
// 1Panel 服务地址。 // 1Panel 服务地址。
ServerUrl string `json:"serverUrl"` ServerUrl string `json:"serverUrl"`
// 1Panel 版本。 // 1Panel 版本。
@ -35,54 +34,54 @@ type DeployerConfig struct {
CertificateId int64 `json:"certificateId,omitempty"` CertificateId int64 `json:"certificateId,omitempty"`
} }
type DeployerProvider struct { type SSLDeployerProvider struct {
config *DeployerConfig config *SSLDeployerProviderConfig
logger *slog.Logger logger *slog.Logger
sdkClient any sdkClient any
sslUploader uploader.Uploader sslManager core.SSLManager
} }
var _ deployer.Deployer = (*DeployerProvider)(nil) var _ core.SSLDeployer = (*SSLDeployerProvider)(nil)
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { func NewSSLDeployerProvider(config *SSLDeployerProviderConfig) (*SSLDeployerProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the ssl deployer provider is nil")
} }
client, err := createSdkClient(config.ServerUrl, config.ApiVersion, config.ApiKey, config.AllowInsecureConnections) client, err := createSDKClient(config.ServerUrl, config.ApiVersion, config.ApiKey, config.AllowInsecureConnections)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create sdk client: %w", err) return nil, fmt.Errorf("could not create sdk client: %w", err)
} }
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ sslmgr, err := sslmgrsp.NewSSLManagerProvider(&sslmgrsp.SSLManagerProviderConfig{
ServerUrl: config.ServerUrl, ServerUrl: config.ServerUrl,
ApiVersion: config.ApiVersion, ApiVersion: config.ApiVersion,
ApiKey: config.ApiKey, ApiKey: config.ApiKey,
AllowInsecureConnections: config.AllowInsecureConnections, AllowInsecureConnections: config.AllowInsecureConnections,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err) return nil, fmt.Errorf("could not create ssl manager: %w", err)
} }
return &DeployerProvider{ return &SSLDeployerProvider{
config: config, config: config,
logger: slog.Default(), logger: slog.Default(),
sdkClient: client, sdkClient: client,
sslUploader: uploader, sslManager: sslmgr,
}, nil }, nil
} }
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { func (d *SSLDeployerProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
d.logger = slog.New(slog.DiscardHandler) d.logger = slog.New(slog.DiscardHandler)
} else { } else {
d.logger = logger d.logger = logger
} }
d.sslUploader.WithLogger(logger)
return d d.sslManager.SetLogger(logger)
} }
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) { func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*core.SSLDeployResult, error) {
// 根据部署资源类型决定部署方式 // 根据部署资源类型决定部署方式
switch d.config.ResourceType { switch d.config.ResourceType {
case RESOURCE_TYPE_WEBSITE: case RESOURCE_TYPE_WEBSITE:
@ -99,16 +98,16 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE
return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType)
} }
return &deployer.DeployResult{}, nil return &core.SSLDeployResult{}, nil
} }
func (d *DeployerProvider) deployToWebsite(ctx context.Context, certPEM string, privkeyPEM string) error { func (d *SSLDeployerProvider) deployToWebsite(ctx context.Context, certPEM string, privkeyPEM string) error {
if d.config.WebsiteId == 0 { if d.config.WebsiteId == 0 {
return errors.New("config `websiteId` is required") return errors.New("config `websiteId` is required")
} }
// 上传证书到面板 // 上传证书
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) upres, err := d.sslManager.Upload(ctx, certPEM, privkeyPEM)
if err != nil { if err != nil {
return fmt.Errorf("failed to upload certificate file: %w", err) return fmt.Errorf("failed to upload certificate file: %w", err)
} else { } else {
@ -179,7 +178,7 @@ func (d *DeployerProvider) deployToWebsite(ctx context.Context, certPEM string,
return nil return nil
} }
func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM string, privkeyPEM string) error { func (d *SSLDeployerProvider) deployToCertificate(ctx context.Context, certPEM string, privkeyPEM string) error {
if d.config.CertificateId == 0 { if d.config.CertificateId == 0 {
return errors.New("config `certificateId` is required") return errors.New("config `certificateId` is required")
} }
@ -245,7 +244,7 @@ const (
sdkVersionV2 = "v2" sdkVersionV2 = "v2"
) )
func createSdkClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool) (any, error) { func createSDKClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool) (any, error) {
if apiVersion == sdkVersionV1 { if apiVersion == sdkVersionV1 {
client, err := onepanelsdk.NewClient(serverUrl, apiKey) client, err := onepanelsdk.NewClient(serverUrl, apiKey)
if err != nil { if err != nil {

18
internal/pkg/core/deployer/providers/1panel-site/1panel_site_test.go → internal/pkg/core/ssl-deployer/providers/1panel-site/1panel_site_test.go
View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"testing" "testing"
provider "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/1panel-site" provider "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/1panel-site"
) )
var ( var (
@ -21,7 +21,7 @@ var (
) )
func init() { func init() {
argsPrefix := "CERTIMATE_DEPLOYER_1PANELSITE_" argsPrefix := "CERTIMATE_SSLDEPLOYER_1PANELSITE_"
flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "")
flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "")
@ -35,12 +35,12 @@ func init() {
Shell command to run this test: Shell command to run this test:
go test -v ./1panel_site_test.go -args \ go test -v ./1panel_site_test.go -args \
--CERTIMATE_DEPLOYER_1PANELSITE_INPUTCERTPATH="/path/to/your-input-cert.pem" \ --CERTIMATE_SSLDEPLOYER_1PANELSITE_INPUTCERTPATH="/path/to/your-input-cert.pem" \
--CERTIMATE_DEPLOYER_1PANELSITE_INPUTKEYPATH="/path/to/your-input-key.pem" \ --CERTIMATE_SSLDEPLOYER_1PANELSITE_INPUTKEYPATH="/path/to/your-input-key.pem" \
--CERTIMATE_DEPLOYER_1PANELSITE_SERVERURL="http://127.0.0.1:20410" \ --CERTIMATE_SSLDEPLOYER_1PANELSITE_SERVERURL="http://127.0.0.1:20410" \
--CERTIMATE_DEPLOYER_1PANELSITE_APIVERSION="v1" \ --CERTIMATE_SSLDEPLOYER_1PANELSITE_APIVERSION="v1" \
--CERTIMATE_DEPLOYER_1PANELSITE_APIKEY="your-api-key" \ --CERTIMATE_SSLDEPLOYER_1PANELSITE_APIKEY="your-api-key" \
--CERTIMATE_DEPLOYER_1PANELSITE_WEBSITEID="your-website-id" --CERTIMATE_SSLDEPLOYER_1PANELSITE_WEBSITEID="your-website-id"
*/ */
func TestDeploy(t *testing.T) { func TestDeploy(t *testing.T) {
flag.Parse() flag.Parse()
@ -56,7 +56,7 @@ func TestDeploy(t *testing.T) {
fmt.Sprintf("WEBSITEID: %v", fWebsiteId), fmt.Sprintf("WEBSITEID: %v", fWebsiteId),
}, "\n")) }, "\n"))
deployer, err := provider.NewDeployer(&provider.DeployerConfig{ deployer, err := provider.NewSSLDeployerProvider(&provider.SSLDeployerProviderConfig{
ServerUrl: fServerUrl, ServerUrl: fServerUrl,
ApiVersion: fApiVersion, ApiVersion: fApiVersion,
ApiKey: fApiKey, ApiKey: fApiKey,

0
internal/pkg/core/deployer/providers/1panel-site/consts.go → internal/pkg/core/ssl-deployer/providers/1panel-site/consts.go
View File

65
internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go → internal/pkg/core/ssl-deployer/providers/aliyun-alb/aliyun_alb.go
View File

@ -15,12 +15,11 @@ import (
"github.com/alibabacloud-go/tea/tea" "github.com/alibabacloud-go/tea/tea"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core"
"github.com/usual2970/certimate/internal/pkg/core/uploader" sslmgrsp "github.com/usual2970/certimate/internal/pkg/core/ssl-manager/providers/aliyun-cas"
uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas"
) )
type DeployerConfig struct { type SSLDeployerProviderConfig struct {
// 阿里云 AccessKeyId。 // 阿里云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"` AccessKeyId string `json:"accessKeyId"`
// 阿里云 AccessKeySecret。 // 阿里云 AccessKeySecret。
@ -42,56 +41,56 @@ type DeployerConfig struct {
Domain string `json:"domain,omitempty"` Domain string `json:"domain,omitempty"`
} }
type DeployerProvider struct { type SSLDeployerProvider struct {
config *DeployerConfig config *SSLDeployerProviderConfig
logger *slog.Logger logger *slog.Logger
sdkClients *wSdkClients sdkClients *wSDKClients
sslUploader uploader.Uploader sslManager core.SSLManager
} }
var _ deployer.Deployer = (*DeployerProvider)(nil) var _ core.SSLDeployer = (*SSLDeployerProvider)(nil)
type wSdkClients struct { type wSDKClients struct {
ALB *alialb.Client ALB *alialb.Client
CAS *alicas.Client CAS *alicas.Client
} }
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { func NewSSLDeployerProvider(config *SSLDeployerProviderConfig) (*SSLDeployerProvider, error) {
if config == nil { if config == nil {
panic("config is nil") return nil, errors.New("the configuration of the ssl deployer provider is nil")
} }
clients, err := createSdkClients(config.AccessKeyId, config.AccessKeySecret, config.Region) clients, err := createSDKClients(config.AccessKeyId, config.AccessKeySecret, config.Region)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create sdk clients: %w", err) return nil, fmt.Errorf("could not create sdk client: %w", err)
} }
uploader, err := createSslUploader(config.AccessKeyId, config.AccessKeySecret, config.ResourceGroupId, config.Region) sslmgr, err := createSSLManager(config.AccessKeyId, config.AccessKeySecret, config.ResourceGroupId, config.Region)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create ssl uploader: %w", err) return nil, fmt.Errorf("could not create ssl manager: %w", err)
} }
return &DeployerProvider{ return &SSLDeployerProvider{
config: config, config: config,
logger: slog.Default(), logger: slog.Default(),
sdkClients: clients, sdkClients: clients,
sslUploader: uploader, sslManager: sslmgr,
}, nil }, nil
} }
func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { func (d *SSLDeployerProvider) SetLogger(logger *slog.Logger) {
if logger == nil { if logger == nil {
d.logger = slog.New(slog.DiscardHandler) d.logger = slog.New(slog.DiscardHandler)
} else { } else {
d.logger = logger d.logger = logger
} }
d.sslUploader.WithLogger(logger)
return d d.sslManager.SetLogger(logger)
} }
func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) { func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*core.SSLDeployResult, error) {
// 上传证书到 CAS // 上传证书
upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) upres, err := d.sslManager.Upload(ctx, certPEM, privkeyPEM)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to upload certificate file: %w", err) return nil, fmt.Errorf("failed to upload certificate file: %w", err)
} else { } else {
@ -114,10 +113,10 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE
return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType)
} }
return &deployer.DeployResult{}, nil return &core.SSLDeployResult{}, nil
} }
func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { func (d *SSLDeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId string) error {
if d.config.LoadbalancerId == "" { if d.config.LoadbalancerId == "" {
return errors.New("config `loadbalancerId` is required") return errors.New("config `loadbalancerId` is required")
} }
@ -231,7 +230,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId
return nil return nil
} }
func (d *DeployerProvider) deployToListener(ctx context.Context, cloudCertId string) error { func (d *SSLDeployerProvider) deployToListener(ctx context.Context, cloudCertId string) error {
if d.config.ListenerId == "" { if d.config.ListenerId == "" {
return errors.New("config `listenerId` is required") return errors.New("config `listenerId` is required")
} }
@ -244,7 +243,7 @@ func (d *DeployerProvider) deployToListener(ctx context.Context, cloudCertId str
return nil return nil
} }
func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudListenerId string, cloudCertId string) error { func (d *SSLDeployerProvider) updateListenerCertificate(ctx context.Context, cloudListenerId string, cloudCertId string) error {
// 查询监听的属性 // 查询监听的属性
// REF: https://help.aliyun.com/zh/slb/application-load-balancer/developer-reference/api-alb-2020-06-16-getlistenerattribute // REF: https://help.aliyun.com/zh/slb/application-load-balancer/developer-reference/api-alb-2020-06-16-getlistenerattribute
getListenerAttributeReq := &alialb.GetListenerAttributeRequest{ getListenerAttributeReq := &alialb.GetListenerAttributeRequest{
@ -421,7 +420,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL
return nil return nil
} }
func createSdkClients(accessKeyId, accessKeySecret, region string) (*wSdkClients, error) { func createSDKClients(accessKeyId, accessKeySecret, region string) (*wSDKClients, error) {
// 接入点一览 https://api.aliyun.com/product/Alb // 接入点一览 https://api.aliyun.com/product/Alb
var albEndpoint string var albEndpoint string
switch region { switch region {
@ -459,13 +458,13 @@ func createSdkClients(accessKeyId, accessKeySecret, region string) (*wSdkClients
return nil, err return nil, err
} }
return &wSdkClients{ return &wSDKClients{
ALB: albClient, ALB: albClient,
CAS: casClient, CAS: casClient,
}, nil }, nil
} }
func createSslUploader(accessKeyId, accessKeySecret, resourceGroupId, region string) (uploader.Uploader, error) { func createSSLManager(accessKeyId, accessKeySecret, resourceGroupId, region string) (core.SSLManager, error) {
casRegion := region casRegion := region
if casRegion != "" { if casRegion != "" {
// 阿里云 CAS 服务接入点是独立于 ALB 服务的 // 阿里云 CAS 服务接入点是独立于 ALB 服务的
@ -478,11 +477,11 @@ func createSslUploader(accessKeyId, accessKeySecret, resourceGroupId, region str
} }
} }
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ sslmgr, err := sslmgrsp.NewSSLManagerProvider(&sslmgrsp.SSLManagerProviderConfig{
AccessKeyId: accessKeyId, AccessKeyId: accessKeyId,
AccessKeySecret: accessKeySecret, AccessKeySecret: accessKeySecret,
ResourceGroupId: resourceGroupId, ResourceGroupId: resourceGroupId,
Region: casRegion, Region: casRegion,
}) })
return uploader, err return sslmgr, err
} }

24
internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb_test.go → internal/pkg/core/ssl-deployer/providers/aliyun-alb/aliyun_alb_test.go
View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"testing" "testing"
provider "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aliyun-alb" provider "github.com/usual2970/certimate/internal/pkg/core/ssl-deployer/providers/aliyun-alb"
) )
var ( var (
@ -23,7 +23,7 @@ var (
) )
func init() { func init() {
argsPrefix := "CERTIMATE_DEPLOYER_ALIYUNALB_" argsPrefix := "CERTIMATE_SSLDEPLOYER_ALIYUNALB_"
flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "")
flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "")
@ -39,14 +39,14 @@ func init() {
Shell command to run this test: Shell command to run this test:
go test -v ./aliyun_alb_test.go -args \ go test -v ./aliyun_alb_test.go -args \
--CERTIMATE_DEPLOYER_ALIYUNALB_INPUTCERTPATH="/path/to/your-input-cert.pem" \ --CERTIMATE_SSLDEPLOYER_ALIYUNALB_INPUTCERTPATH="/path/to/your-input-cert.pem" \
--CERTIMATE_DEPLOYER_ALIYUNALB_INPUTKEYPATH="/path/to/your-input-key.pem" \ --CERTIMATE_SSLDEPLOYER_ALIYUNALB_INPUTKEYPATH="/path/to/your-input-key.pem" \
--CERTIMATE_DEPLOYER_ALIYUNALB_ACCESSKEYID="your-access-key-id" \ --CERTIMATE_SSLDEPLOYER_ALIYUNALB_ACCESSKEYID="your-access-key-id" \
--CERTIMATE_DEPLOYER_ALIYUNALB_ACCESSKEYSECRET="your-access-key-secret" \ --CERTIMATE_SSLDEPLOYER_ALIYUNALB_ACCESSKEYSECRET="your-access-key-secret" \
--CERTIMATE_DEPLOYER_ALIYUNALB_REGION="cn-hangzhou" \ --CERTIMATE_SSLDEPLOYER_ALIYUNALB_REGION="cn-hangzhou" \
--CERTIMATE_DEPLOYER_ALIYUNALB_LOADBALANCERID="your-alb-instance-id" \ --CERTIMATE_SSLDEPLOYER_ALIYUNALB_LOADBALANCERID="your-alb-instance-id" \
--CERTIMATE_DEPLOYER_ALIYUNALB_LISTENERID="your-alb-listener-id" \ --CERTIMATE_SSLDEPLOYER_ALIYUNALB_LISTENERID="your-alb-listener-id" \
--CERTIMATE_DEPLOYER_ALIYUNALB_DOMAIN="your-alb-sni-domain" --CERTIMATE_SSLDEPLOYER_ALIYUNALB_DOMAIN="your-alb-sni-domain"
*/ */
func TestDeploy(t *testing.T) { func TestDeploy(t *testing.T) {
flag.Parse() flag.Parse()
@ -63,7 +63,7 @@ func TestDeploy(t *testing.T) {
fmt.Sprintf("DOMAIN: %v", fDomain), fmt.Sprintf("DOMAIN: %v", fDomain),
}, "\n")) }, "\n"))
deployer, err := provider.NewDeployer(&provider.DeployerConfig{ deployer, err := provider.NewSSLDeployerProvider(&provider.SSLDeployerProviderConfig{
AccessKeyId: fAccessKeyId, AccessKeyId: fAccessKeyId,
AccessKeySecret: fAccessKeySecret, AccessKeySecret: fAccessKeySecret,
Region: fRegion, Region: fRegion,
@ -99,7 +99,7 @@ func TestDeploy(t *testing.T) {
fmt.Sprintf("DOMAIN: %v", fDomain), fmt.Sprintf("DOMAIN: %v", fDomain),
}, "\n")) }, "\n"))
deployer, err := provider.NewDeployer(&provider.DeployerConfig{ deployer, err := provider.NewSSLDeployerProvider(&provider.SSLDeployerProviderConfig{
AccessKeyId: fAccessKeyId, AccessKeyId: fAccessKeyId,
AccessKeySecret: fAccessKeySecret, AccessKeySecret: fAccessKeySecret,
Region: fRegion, Region: fRegion,

0
internal/pkg/core/deployer/providers/aliyun-alb/consts.go → internal/pkg/core/ssl-deployer/providers/aliyun-alb/consts.go
View File

Some files were not shown because too many files have changed in this diff Show More