refactor: normalize providers constructors

This commit is contained in:
Fu Diwei 2025-02-20 00:16:26 +08:00
parent 72896e052c
commit 0e1f720419
48 changed files with 139 additions and 139 deletions

View File

@ -442,7 +442,7 @@ func createSslUploader(accessKeyId, accessKeySecret, region string) (uploader.Up
}
}
uploader, err := uploadersp.New(&uploadersp.AliyunCASUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: accessKeyId,
AccessKeySecret: accessKeySecret,
Region: casRegion,

View File

@ -175,7 +175,7 @@ func createSdkClient(accessKeyId, accessKeySecret, region string) (*aliyunCas.Cl
}
func createSslUploader(accessKeyId, accessKeySecret, region string) (uploader.Uploader, error) {
uploader, err := uploadersp.New(&uploadersp.AliyunCASUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: accessKeyId,
AccessKeySecret: accessKeySecret,
Region: region,

View File

@ -55,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.AliyunSLBUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
Region: config.Region,

View File

@ -126,7 +126,7 @@ func createSslUploader(accessKeyId, accessKeySecret, region string) (uploader.Up
}
}
uploader, err := uploadersp.New(&uploadersp.AliyunCASUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: accessKeyId,
AccessKeySecret: accessKeySecret,
Region: casRegion,

View File

@ -245,7 +245,7 @@ func createSslUploader(accessKeyId, accessKeySecret, region string) (uploader.Up
}
}
uploader, err := uploadersp.New(&uploadersp.AliyunCASUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: accessKeyId,
AccessKeySecret: accessKeySecret,
Region: casRegion,

View File

@ -139,7 +139,7 @@ func createSslUploader(accessKeyId, accessKeySecret, region string) (uploader.Up
}
}
uploader, err := uploadersp.New(&uploadersp.AliyunCASUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: accessKeyId,
AccessKeySecret: accessKeySecret,
Region: casRegion,

View File

@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.AWSCertificateManagerUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
SecretAccessKey: config.SecretAccessKey,
Region: config.Region,

View File

@ -42,7 +42,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
client.Client.SetAccessKey(config.AccessKey)
client.Client.SetSecretKey(config.SecretKey)
uploader, err := uploadersp.New(&uploadersp.ByteplusCDNUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKey: config.AccessKey,
SecretKey: config.SecretKey,
})

View File

@ -38,7 +38,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
client := dogesdk.NewClient(config.AccessKey, config.SecretKey)
uploader, err := uploadersp.New(&uploadersp.DogeCloudUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKey: config.AccessKey,
SecretKey: config.SecretKey,
})

View File

@ -42,7 +42,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.GcoreCDNUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
ApiToken: config.ApiToken,
})
if err != nil {

View File

@ -50,7 +50,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.HuaweiCloudSCMUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
SecretAccessKey: config.SecretAccessKey,
})

View File

@ -62,7 +62,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.HuaweiCloudELBUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
SecretAccessKey: config.SecretAccessKey,
Region: config.Region,

View File

@ -59,7 +59,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.HuaweiCloudWAFUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
SecretAccessKey: config.SecretAccessKey,
Region: config.Region,

View File

@ -39,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
client := qiniusdk.NewClient(auth.New(config.AccessKey, config.SecretKey))
uploader, err := uploadersp.New(&uploadersp.QiniuSSLCertUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKey: config.AccessKey,
SecretKey: config.SecretKey,
})

View File

@ -39,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
manager := pili.NewManager(pili.ManagerConfig{AccessKey: config.AccessKey, SecretKey: config.SecretKey})
uploader, err := uploadersp.New(&uploadersp.QiniuSSLCertUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKey: config.AccessKey,
SecretKey: config.SecretKey,
})

View File

@ -50,7 +50,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk clients")
}
uploader, err := uploadersp.New(&uploadersp.TencentCloudSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})

View File

@ -61,7 +61,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk clients")
}
uploader, err := uploadersp.New(&uploadersp.TencentCloudSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})

View File

@ -48,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk clients")
}
uploader, err := uploadersp.New(&uploadersp.TencentCloudSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})

View File

@ -42,7 +42,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.TencentCloudSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})

View File

@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk clients")
}
uploader, err := uploadersp.New(&uploadersp.TencentCloudSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})

View File

@ -51,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk clients")
}
uploader, err := uploadersp.New(&uploadersp.TencentCloudSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})

View File

@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.TencentCloudSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})

View File

@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk clients")
}
uploader, err := uploadersp.New(&uploadersp.TencentCloudSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
SecretId: config.SecretId,
SecretKey: config.SecretKey,
})

View File

@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.UCloudUSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
PrivateKey: config.PrivateKey,
PublicKey: config.PublicKey,
ProjectId: config.ProjectId,

View File

@ -48,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.UCloudUSSLUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
PrivateKey: config.PrivateKey,
PublicKey: config.PublicKey,
ProjectId: config.ProjectId,

View File

@ -42,7 +42,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
client.Client.SetAccessKey(config.AccessKeyId)
client.Client.SetSecretKey(config.AccessKeySecret)
uploader, err := uploadersp.New(&uploadersp.VolcEngineCDNUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
})

View File

@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.VolcEngineCertCenterUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
Region: config.Region,

View File

@ -45,7 +45,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.VolcEngineCertCenterUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
Region: config.Region,

View File

@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.VolcEngineCertCenterUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
Region: config.Region,

View File

@ -43,7 +43,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
client.SetAccessKey(config.AccessKeyId)
client.SetSecretKey(config.AccessKeySecret)
uploader, err := uploadersp.New(&uploadersp.VolcEngineLiveUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
})

View File

@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
uploader, err := uploadersp.New(&uploadersp.VolcEngineCertCenterUploaderConfig{
uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{
AccessKeyId: config.AccessKeyId,
AccessKeySecret: config.AccessKeySecret,
Region: config.Region,

View File

@ -15,7 +15,7 @@ import (
"github.com/usual2970/certimate/internal/pkg/utils/certs"
)
type AliyunCASUploaderConfig struct {
type UploaderConfig struct {
// 阿里云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 阿里云 AccessKeySecret。
@ -24,14 +24,14 @@ type AliyunCASUploaderConfig struct {
Region string `json:"region"`
}
type AliyunCASUploader struct {
config *AliyunCASUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *aliyunCas.Client
}
var _ uploader.Uploader = (*AliyunCASUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *AliyunCASUploaderConfig) (*AliyunCASUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -45,13 +45,13 @@ func New(config *AliyunCASUploaderConfig) (*AliyunCASUploader, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &AliyunCASUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -18,7 +18,7 @@ import (
"github.com/usual2970/certimate/internal/pkg/utils/certs"
)
type AliyunSLBUploaderConfig struct {
type UploaderConfig struct {
// 阿里云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 阿里云 AccessKeySecret。
@ -27,14 +27,14 @@ type AliyunSLBUploaderConfig struct {
Region string `json:"region"`
}
type AliyunSLBUploader struct {
config *AliyunSLBUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *aliyunSlb.Client
}
var _ uploader.Uploader = (*AliyunSLBUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *AliyunSLBUploaderConfig) (*AliyunSLBUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -48,13 +48,13 @@ func New(config *AliyunSLBUploaderConfig) (*AliyunSLBUploader, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &AliyunSLBUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *AliyunSLBUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -15,7 +15,7 @@ import (
"github.com/usual2970/certimate/internal/pkg/utils/certs"
)
type AWSCertificateManagerUploaderConfig struct {
type UploaderConfig struct {
// AWS AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// AWS SecretAccessKey。
@ -24,14 +24,14 @@ type AWSCertificateManagerUploaderConfig struct {
Region string `json:"region"`
}
type AWSCertificateManagerUploader struct {
config *AWSCertificateManagerUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *awsAcm.Client
}
var _ uploader.Uploader = (*AWSCertificateManagerUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *AWSCertificateManagerUploaderConfig) (*AWSCertificateManagerUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -41,13 +41,13 @@ func New(config *AWSCertificateManagerUploaderConfig) (*AWSCertificateManagerUpl
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &AWSCertificateManagerUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *AWSCertificateManagerUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -16,21 +16,21 @@ import (
"github.com/usual2970/certimate/internal/pkg/utils/certs"
)
type ByteplusCDNUploaderConfig struct {
type UploaderConfig struct {
// BytePlus AccessKey。
AccessKey string `json:"accessKey"`
// BytePlus SecretKey。
SecretKey string `json:"secretKey"`
}
type ByteplusCDNUploader struct {
config *ByteplusCDNUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *bpCdn.CDN
}
var _ uploader.Uploader = (*ByteplusCDNUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *ByteplusCDNUploaderConfig) (*ByteplusCDNUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -39,13 +39,13 @@ func New(config *ByteplusCDNUploaderConfig) (*ByteplusCDNUploader, error) {
client.Client.SetAccessKey(config.AccessKey)
client.Client.SetSecretKey(config.SecretKey)
return &ByteplusCDNUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *ByteplusCDNUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -11,21 +11,21 @@ import (
doge "github.com/usual2970/certimate/internal/pkg/vendors/dogecloud-sdk"
)
type DogeCloudUploaderConfig struct {
type UploaderConfig struct {
// 多吉云 AccessKey。
AccessKey string `json:"accessKey"`
// 多吉云 SecretKey。
SecretKey string `json:"secretKey"`
}
type DogeCloudUploader struct {
config *DogeCloudUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *doge.Client
}
var _ uploader.Uploader = (*DogeCloudUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *DogeCloudUploaderConfig) (*DogeCloudUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -38,13 +38,13 @@ func New(config *DogeCloudUploaderConfig) (*DogeCloudUploader, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &DogeCloudUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *DogeCloudUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 生成新证书名(需符合多吉云命名规则)
var certId, certName string
certName = fmt.Sprintf("certimate-%d", time.Now().UnixMilli())

View File

@ -14,19 +14,19 @@ import (
gcoresdk "github.com/usual2970/certimate/internal/pkg/vendors/gcore-sdk/common"
)
type GcoreCDNUploaderConfig struct {
type UploaderConfig struct {
// Gcore API Token。
ApiToken string `json:"apiToken"`
}
type GcoreCDNUploader struct {
config *GcoreCDNUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *gsslcerts.Service
}
var _ uploader.Uploader = (*GcoreCDNUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *GcoreCDNUploaderConfig) (*GcoreCDNUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -36,13 +36,13 @@ func New(config *GcoreCDNUploaderConfig) (*GcoreCDNUploader, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &GcoreCDNUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *GcoreCDNUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 生成新证书名(需符合 Gcore 命名规则)
var certId, certName string
certName = fmt.Sprintf("certimate_%d", time.Now().UnixMilli())

View File

@ -21,7 +21,7 @@ import (
hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk"
)
type HuaweiCloudELBUploaderConfig struct {
type UploaderConfig struct {
// 华为云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 华为云 SecretAccessKey。
@ -30,14 +30,14 @@ type HuaweiCloudELBUploaderConfig struct {
Region string `json:"region"`
}
type HuaweiCloudELBUploader struct {
config *HuaweiCloudELBUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *hcElb.ElbClient
}
var _ uploader.Uploader = (*HuaweiCloudELBUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *HuaweiCloudELBUploaderConfig) (*HuaweiCloudELBUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -51,13 +51,13 @@ func New(config *HuaweiCloudELBUploaderConfig) (*HuaweiCloudELBUploader, error)
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &HuaweiCloudELBUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -16,7 +16,7 @@ import (
hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk"
)
type HuaweiCloudSCMUploaderConfig struct {
type UploaderConfig struct {
// 华为云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 华为云 SecretAccessKey。
@ -25,14 +25,14 @@ type HuaweiCloudSCMUploaderConfig struct {
Region string `json:"region"`
}
type HuaweiCloudSCMUploader struct {
config *HuaweiCloudSCMUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *hcScm.ScmClient
}
var _ uploader.Uploader = (*HuaweiCloudSCMUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *HuaweiCloudSCMUploaderConfig) (*HuaweiCloudSCMUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -46,13 +46,13 @@ func New(config *HuaweiCloudSCMUploaderConfig) (*HuaweiCloudSCMUploader, error)
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &HuaweiCloudSCMUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -21,7 +21,7 @@ import (
hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk"
)
type HuaweiCloudWAFUploaderConfig struct {
type UploaderConfig struct {
// 华为云 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 华为云 SecretAccessKey。
@ -30,14 +30,14 @@ type HuaweiCloudWAFUploaderConfig struct {
Region string `json:"region"`
}
type HuaweiCloudWAFUploader struct {
config *HuaweiCloudWAFUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *hcWaf.WafClient
}
var _ uploader.Uploader = (*HuaweiCloudWAFUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *HuaweiCloudWAFUploaderConfig) (*HuaweiCloudWAFUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -51,13 +51,13 @@ func New(config *HuaweiCloudWAFUploaderConfig) (*HuaweiCloudWAFUploader, error)
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &HuaweiCloudWAFUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *HuaweiCloudWAFUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -13,21 +13,21 @@ import (
qiniuEx "github.com/usual2970/certimate/internal/pkg/vendors/qiniu-sdk"
)
type QiniuSSLCertUploaderConfig struct {
type UploaderConfig struct {
// 七牛云 AccessKey。
AccessKey string `json:"accessKey"`
// 七牛云 SecretKey。
SecretKey string `json:"secretKey"`
}
type QiniuSSLCertUploader struct {
config *QiniuSSLCertUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *qiniuEx.Client
}
var _ uploader.Uploader = (*QiniuSSLCertUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *QiniuSSLCertUploaderConfig) (*QiniuSSLCertUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -40,13 +40,13 @@ func New(config *QiniuSSLCertUploaderConfig) (*QiniuSSLCertUploader, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &QiniuSSLCertUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *QiniuSSLCertUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -11,21 +11,21 @@ import (
"github.com/usual2970/certimate/internal/pkg/core/uploader"
)
type TencentCloudSSLUploaderConfig struct {
type UploaderConfig struct {
// 腾讯云 SecretId。
SecretId string `json:"secretId"`
// 腾讯云 SecretKey。
SecretKey string `json:"secretKey"`
}
type TencentCloudSSLUploader struct {
config *TencentCloudSSLUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *tcSsl.Client
}
var _ uploader.Uploader = (*TencentCloudSSLUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *TencentCloudSSLUploaderConfig) (*TencentCloudSSLUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -38,13 +38,13 @@ func New(config *TencentCloudSSLUploaderConfig) (*TencentCloudSSLUploader, error
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &TencentCloudSSLUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *TencentCloudSSLUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 上传新证书
// REF: https://cloud.tencent.com/document/product/400/41665
uploadCertificateReq := tcSsl.NewUploadCertificateRequest()

View File

@ -20,7 +20,7 @@ import (
usdkSsl "github.com/usual2970/certimate/internal/pkg/vendors/ucloud-sdk/ussl"
)
type UCloudUSSLUploaderConfig struct {
type UploaderConfig struct {
// 优刻得 API 私钥。
PrivateKey string `json:"privateKey"`
// 优刻得 API 公钥。
@ -29,14 +29,14 @@ type UCloudUSSLUploaderConfig struct {
ProjectId string `json:"projectId,omitempty"`
}
type UCloudUSSLUploader struct {
config *UCloudUSSLUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *usdkSsl.USSLClient
}
var _ uploader.Uploader = (*UCloudUSSLUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *UCloudUSSLUploaderConfig) (*UCloudUSSLUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -46,13 +46,13 @@ func New(config *UCloudUSSLUploaderConfig) (*UCloudUSSLUploader, error) {
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &UCloudUSSLUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *UCloudUSSLUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 生成新证书名(需符合优刻得命名规则)
var certId, certName string
certName = fmt.Sprintf("certimate-%d", time.Now().UnixMilli())
@ -92,7 +92,7 @@ func (u *UCloudUSSLUploader) Upload(ctx context.Context, certPem string, privkey
}, nil
}
func (u *UCloudUSSLUploader) getExistCert(ctx context.Context, certPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) getExistCert(ctx context.Context, certPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -49,7 +49,7 @@ func TestDeploy(t *testing.T) {
fmt.Sprintf("PUBLICKEY: %v", fPublicKey),
}, "\n"))
uploader, err := provider.New(&provider.UCloudUSSLUploaderConfig{
uploader, err := provider.NewUploader(&provider.UploaderConfig{
PrivateKey: fPrivateKey,
PublicKey: fPublicKey,
})

View File

@ -17,21 +17,21 @@ import (
"github.com/usual2970/certimate/internal/pkg/utils/certs"
)
type VolcEngineCDNUploaderConfig struct {
type UploaderConfig struct {
// 火山引擎 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 火山引擎 AccessKeySecret。
AccessKeySecret string `json:"accessKeySecret"`
}
type VolcEngineCDNUploader struct {
config *VolcEngineCDNUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *veCdn.CDN
}
var _ uploader.Uploader = (*VolcEngineCDNUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *VolcEngineCDNUploaderConfig) (*VolcEngineCDNUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -40,13 +40,13 @@ func New(config *VolcEngineCDNUploaderConfig) (*VolcEngineCDNUploader, error) {
client.Client.SetAccessKey(config.AccessKeyId)
client.Client.SetSecretKey(config.AccessKeySecret)
return &VolcEngineCDNUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *VolcEngineCDNUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {

View File

@ -11,7 +11,7 @@ import (
vesdkCc "github.com/usual2970/certimate/internal/pkg/vendors/volcengine-sdk/certcenter"
)
type VolcEngineCertCenterUploaderConfig struct {
type UploaderConfig struct {
// 火山引擎 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 火山引擎 AccessKeySecret。
@ -20,14 +20,14 @@ type VolcEngineCertCenterUploaderConfig struct {
Region string `json:"region"`
}
type VolcEngineCertCenterUploader struct {
config *VolcEngineCertCenterUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *vesdkCc.CertCenter
}
var _ uploader.Uploader = (*VolcEngineCertCenterUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *VolcEngineCertCenterUploaderConfig) (*VolcEngineCertCenterUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -37,13 +37,13 @@ func New(config *VolcEngineCertCenterUploaderConfig) (*VolcEngineCertCenterUploa
return nil, xerrors.Wrap(err, "failed to create sdk client")
}
return &VolcEngineCertCenterUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *VolcEngineCertCenterUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 上传证书
// REF: https://www.volcengine.com/docs/6638/1365580
importCertificateReq := &vesdkCc.ImportCertificateInput{

View File

@ -49,7 +49,7 @@ func TestDeploy(t *testing.T) {
fmt.Sprintf("ACCESSKEYSECRET: %v", fAccessKeySecret),
}, "\n"))
uploader, err := provider.New(&provider.VolcEngineCertCenterUploaderConfig{
uploader, err := provider.NewUploader(&provider.UploaderConfig{
AccessKeyId: fAccessKeyId,
AccessKeySecret: fAccessKeySecret,
})

View File

@ -14,21 +14,21 @@ import (
"github.com/usual2970/certimate/internal/pkg/utils/certs"
)
type VolcEngineLiveUploaderConfig struct {
type UploaderConfig struct {
// 火山引擎 AccessKeyId。
AccessKeyId string `json:"accessKeyId"`
// 火山引擎 AccessKeySecret。
AccessKeySecret string `json:"accessKeySecret"`
}
type VolcEngineLiveUploader struct {
config *VolcEngineLiveUploaderConfig
type UploaderProvider struct {
config *UploaderConfig
sdkClient *veLive.Live
}
var _ uploader.Uploader = (*VolcEngineLiveUploader)(nil)
var _ uploader.Uploader = (*UploaderProvider)(nil)
func New(config *VolcEngineLiveUploaderConfig) (*VolcEngineLiveUploader, error) {
func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
if config == nil {
panic("config is nil")
}
@ -37,13 +37,13 @@ func New(config *VolcEngineLiveUploaderConfig) (*VolcEngineLiveUploader, error)
client.SetAccessKey(config.AccessKeyId)
client.SetSecretKey(config.AccessKeySecret)
return &VolcEngineLiveUploader{
return &UploaderProvider{
config: config,
sdkClient: client,
}, nil
}
func (u *VolcEngineLiveUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容
certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil {