refactor: clean code

This commit is contained in:
Fu Diwei
2024-12-27 19:35:50 +08:00
parent 047479426a
commit 86133ba52b
41 changed files with 396 additions and 544 deletions

View File

@@ -14,6 +14,7 @@ import (
/*
提供商部署目标常量值。
短横线前的部分始终等于提供商类型。
注意:如果追加新的常量值,请保持以 ASCII 排序。
NOTICE: If you add new constant, please keep ASCII order.
@@ -140,7 +141,7 @@ type proxyDeployer struct {
}
func (d *proxyDeployer) GetID() string {
return fmt.Sprintf("%s-%s", d.option.AccessRecord.GetString("name"), d.option.AccessRecord.Id)
return fmt.Sprintf("%s-%s", d.option.AccessRecord.Name, d.option.AccessRecord.Id)
}
func (d *proxyDeployer) GetInfos() []string {

View File

@@ -43,7 +43,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
switch target {
case targetAliyunALB, targetAliyunCDN, targetAliyunCLB, targetAliyunDCDN, targetAliyunNLB, targetAliyunOSS:
{
access := &domain.AliyunAccess{}
access := &domain.AliyunAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -115,7 +115,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetBaiduCloudCDN:
{
access := &domain.BaiduCloudAccess{}
access := &domain.BaiduCloudAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -130,7 +130,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetBytePlusCDN:
{
access := &domain.ByteplusAccess{}
access := &domain.BytePlusAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -145,7 +145,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetDogeCloudCDN:
{
access := &domain.DogeCloudAccess{}
access := &domain.DogeCloudAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -160,7 +160,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetHuaweiCloudCDN, targetHuaweiCloudELB:
{
access := &domain.HuaweiCloudAccess{}
access := &domain.HuaweiCloudAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -211,7 +211,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetK8sSecret:
{
access := &domain.KubernetesAccess{}
access := &domain.KubernetesAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -228,7 +228,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetQiniuCDN:
{
access := &domain.QiniuAccess{}
access := &domain.QiniuAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -243,7 +243,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetSSH:
{
access := &domain.SSHAccess{}
access := &domain.SSHAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -271,7 +271,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetTencentCloudCDN, targetTencentCloudCLB, targetTencentCloudCOS, targetTencentCloudECDN, targetTencentCloudEO:
{
access := &domain.TencentAccess{}
access := &domain.TencentCloudAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -331,7 +331,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetVolcEngineCDN, targetVolcEngineLive:
{
access := &domain.VolcEngineAccess{}
access := &domain.VolcEngineAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}
@@ -339,16 +339,16 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
switch target {
case targetVolcEngineCDN:
deployer, err := providerVolcEngineCDN.NewWithLogger(&providerVolcEngineCDN.VolcEngineCDNDeployerConfig{
AccessKey: access.AccessKey,
SecretKey: access.SecretKey,
AccessKey: access.AccessKeyId,
SecretKey: access.SecretAccessKey,
Domain: maps.GetValueAsString(deployConfig, "domain"),
}, logger)
return deployer, logger, err
case targetVolcEngineLive:
deployer, err := providerVolcEngineLive.NewWithLogger(&providerVolcEngineLive.VolcEngineLiveDeployerConfig{
AccessKey: access.AccessKey,
SecretKey: access.SecretKey,
AccessKey: access.AccessKeyId,
SecretKey: access.SecretAccessKey,
Domain: maps.GetValueAsString(deployConfig, "domain"),
}, logger)
return deployer, logger, err
@@ -360,7 +360,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
case targetWebhook:
{
access := &domain.WebhookAccess{}
access := &domain.WebhookAccessConfig{}
if err := json.Unmarshal([]byte(accessConfig), access); err != nil {
return nil, nil, fmt.Errorf("failed to unmarshal access config: %w", err)
}