refactor: normalize providers constructors

This commit is contained in:
Fu Diwei
2025-02-18 19:18:28 +08:00
parent 1bac6174ad
commit ff53866e9e
132 changed files with 1014 additions and 1160 deletions

View File

@@ -14,47 +14,44 @@ import (
"github.com/usual2970/certimate/internal/pkg/utils/certs"
)
type WebhookDeployerConfig struct {
type DeployerConfig struct {
// Webhook URL。
WebhookUrl string `json:"webhookUrl"`
// Webhook 回调数据JSON 格式)。
WebhookData string `json:"webhookData,omitempty"`
}
type WebhookDeployer struct {
config *WebhookDeployerConfig
type DeployerProvider struct {
config *DeployerConfig
logger logger.Logger
httpClient *resty.Client
}
var _ deployer.Deployer = (*WebhookDeployer)(nil)
var _ deployer.Deployer = (*DeployerProvider)(nil)
func New(config *WebhookDeployerConfig) (*WebhookDeployer, error) {
return NewWithLogger(config, logger.NewNilLogger())
}
func NewWithLogger(config *WebhookDeployerConfig, logger logger.Logger) (*WebhookDeployer, error) {
func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
if config == nil {
panic("config is nil")
}
if logger == nil {
panic("logger is nil")
}
client := resty.New().
SetTimeout(30 * time.Second).
SetRetryCount(3).
SetRetryWaitTime(5 * time.Second)
return &WebhookDeployer{
return &DeployerProvider{
config: config,
logger: logger,
logger: logger.NewNilLogger(),
httpClient: client,
}, nil
}
func (d *WebhookDeployer) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) {
func (d *DeployerProvider) WithLogger(logger logger.Logger) *DeployerProvider {
d.logger = logger
return d
}
func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) {
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {
return nil, xerrors.Wrap(err, "failed to parse x509")

View File

@@ -48,7 +48,7 @@ func TestDeploy(t *testing.T) {
fmt.Sprintf("WEBHOOKDATA: %v", fWebhookData),
}, "\n"))
deployer, err := provider.New(&provider.WebhookDeployerConfig{
deployer, err := provider.NewDeployer(&provider.DeployerConfig{
WebhookUrl: fWebhookUrl,
WebhookData: fWebhookData,
})