style: format

2024-10-15 21:14:54 +08:00
parent cf3de10eff
commit 26be47d072
29 changed files with 71 additions and 98 deletions
--- a/internal/deployer/aliyun.go
+++ b/internal/deployer/aliyun.go
@@ -1,12 +1,13 @@
 package deployer

 import (
-	"certimate/internal/domain"
 	"context"
 	"encoding/json"
 	"fmt"

 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
+
+	"certimate/internal/domain"
 )

 type aliyun struct {
@@ -28,7 +29,6 @@ func NewAliyun(option *DeployerOption) (Deployer, error) {
 	}
 	a.client = client
 	return a, nil
-
 }

 func (a *aliyun) GetID() string {
@@ -48,13 +48,11 @@ func (a *aliyun) Deploy(ctx context.Context) error {
 			Force:       true,
 		},
 	})
-
 	if err != nil {
 		return fmt.Errorf("deploy aliyun oss error: %w", err)
 	}

 	return nil
-
 }

 func (a *aliyun) createClient(accessKeyId, accessKeySecret string) (*oss.Client, error) {
--- a/internal/deployer/aliyun_cdn.go
+++ b/internal/deployer/aliyun_cdn.go
@@ -1,8 +1,6 @@
 package deployer

 import (
-	"certimate/internal/domain"
-	"certimate/internal/utils/rand"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -11,6 +9,9 @@ import (
 	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
 	util "github.com/alibabacloud-go/tea-utils/v2/service"
 	"github.com/alibabacloud-go/tea/tea"
+
+	"certimate/internal/domain"
+	"certimate/internal/utils/rand"
 )

 type AliyunCdn struct {
@@ -46,7 +47,6 @@ func (a *AliyunCdn) GetInfo() []string {
 }

 func (a *AliyunCdn) Deploy(ctx context.Context) error {
-
 	certName := fmt.Sprintf("%s-%s-%s", a.option.Domain, a.option.DomainId, rand.RandStr(6))
 	setCdnDomainSSLCertificateRequest := &cdn20180510.SetCdnDomainSSLCertificateRequest{
 		DomainName:  tea.String(getDeployString(a.option.DeployConfig, "domain")),
--- a/internal/deployer/aliyun_esa.go
+++ b/internal/deployer/aliyun_esa.go
@@ -6,8 +6,6 @@
 package deployer

 import (
-	"certimate/internal/domain"
-	"certimate/internal/utils/rand"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -16,6 +14,9 @@ import (
 	dcdn20180115 "github.com/alibabacloud-go/dcdn-20180115/v3/client"
 	util "github.com/alibabacloud-go/tea-utils/v2/service"
 	"github.com/alibabacloud-go/tea/tea"
+
+	"certimate/internal/domain"
+	"certimate/internal/utils/rand"
 )

 type AliyunEsa struct {
@@ -51,7 +52,6 @@ func (a *AliyunEsa) GetInfo() []string {
 }

 func (a *AliyunEsa) Deploy(ctx context.Context) error {
-
 	certName := fmt.Sprintf("%s-%s-%s", a.option.Domain, a.option.DomainId, rand.RandStr(6))
 	setDcdnDomainSSLCertificateRequest := &dcdn20180115.SetDcdnDomainSSLCertificateRequest{
 		DomainName:  tea.String(getDeployString(a.option.DeployConfig, "domain")),
--- a/internal/deployer/deployer.go
+++ b/internal/deployer/deployer.go
@@ -1,9 +1,6 @@
 package deployer

 import (
-	"certimate/internal/applicant"
-	"certimate/internal/domain"
-	"certimate/internal/utils/app"
 	"context"
 	"encoding/json"
 	"errors"
@@ -11,6 +8,10 @@ import (
 	"strings"

 	"github.com/pocketbase/pocketbase/models"
+
+	"certimate/internal/applicant"
+	"certimate/internal/domain"
+	"certimate/internal/utils/app"
 )

 const (
@@ -61,7 +62,6 @@ func Gets(record *models.Record, cert *applicant.Certificate) ([]Deployer, error
 	for _, deployConfig := range deployConfigs {

 		deployer, err := getWithDeployConfig(record, cert, deployConfig)
-
 		if err != nil {
 			return nil, err
 		}
@@ -70,13 +70,10 @@ func Gets(record *models.Record, cert *applicant.Certificate) ([]Deployer, error
 	}

 	return rs, nil
-
 }

 func getWithDeployConfig(record *models.Record, cert *applicant.Certificate, deployConfig domain.DeployConfig) (Deployer, error) {
-
 	access, err := app.GetApp().Dao().FindRecordById("access", deployConfig.Access)
-
 	if err != nil {
 		return nil, fmt.Errorf("access record not found: %w", err)
 	}
@@ -169,5 +166,4 @@ func getDeployVariables(conf domain.DeployConfig) map[string]string {
 	}

 	return rs
-
 }
--- a/internal/deployer/local.go
+++ b/internal/deployer/local.go
@@ -10,8 +10,7 @@ import (
 	"runtime"
 )

-type localAccess struct {
-}
+type localAccess struct{}

 type local struct {
 	option *DeployerOption
--- a/internal/deployer/qiniu.go
+++ b/internal/deployer/qiniu.go
@@ -2,8 +2,6 @@ package deployer

 import (
 	"bytes"
-	"certimate/internal/domain"
-	xhttp "certimate/internal/utils/http"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -11,6 +9,9 @@ import (
 	"net/http"

 	"github.com/qiniu/go-sdk/v7/auth"
+
+	"certimate/internal/domain"
+	xhttp "certimate/internal/utils/http"
 )

 const qiniuGateway = "http://api.qiniu.com"
@@ -42,7 +43,6 @@ func (q *qiuniu) GetInfo() []string {
 }

 func (q *qiuniu) Deploy(ctx context.Context) error {
-
 	// 上传证书
 	certId, err := q.uploadCert()
 	if err != nil {
--- a/internal/deployer/qiniu_test.go
+++ b/internal/deployer/qiniu_test.go
@@ -1,10 +1,11 @@
 package deployer

 import (
-	"certimate/internal/applicant"
 	"testing"

 	"github.com/qiniu/go-sdk/v7/auth"
+
+	"certimate/internal/applicant"
 )

 func Test_qiuniu_uploadCert(t *testing.T) {
--- a/internal/deployer/ssh.go
+++ b/internal/deployer/ssh.go
@@ -103,7 +103,6 @@ func (s *ssh) sshExecCommand(client *sshPkg.Client, command string) (error, stri
 }

 func (s *ssh) upload(client *sshPkg.Client, content, path string) error {
-
 	sftpCli, err := sftp.NewClient(client)
 	if err != nil {
 		return fmt.Errorf("failed to create sftp client: %w", err)
@@ -129,7 +128,6 @@ func (s *ssh) upload(client *sshPkg.Client, content, path string) error {
 }

 func (s *ssh) getClient(access *sshAccess) (*sshPkg.Client, error) {
-
 	var authMethod sshPkg.AuthMethod

 	if access.Key != "" {
--- a/internal/deployer/ssh_test.go
+++ b/internal/deployer/ssh_test.go
@@ -8,5 +8,5 @@ import (

 func TestPath(t *testing.T) {
 	dir := path.Dir("./a/b/c")
-	os.MkdirAll(dir, 0755)
+	os.MkdirAll(dir, 0o755)
 }
--- a/internal/deployer/tencent_cdn.go
+++ b/internal/deployer/tencent_cdn.go
@@ -1,18 +1,19 @@
 package deployer

 import (
-	"certimate/internal/domain"
-	"certimate/internal/utils/rand"
 	"context"
-	"encoding/json"
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"strings"

+	cdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
 	ssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205"
-	cdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606"
+
+	"certimate/internal/domain"
+	"certimate/internal/utils/rand"
 )

 type tencentCdn struct {
@@ -22,7 +23,6 @@ type tencentCdn struct {
 }

 func NewTencentCdn(option *DeployerOption) (Deployer, error) {
-
 	access := &domain.TencentAccess{}
 	if err := json.Unmarshal([]byte(option.Access), access); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal tencent access: %w", err)
@@ -49,7 +49,6 @@ func (t *tencentCdn) GetInfo() []string {
 }

 func (t *tencentCdn) Deploy(ctx context.Context) error {
-
 	// 上传证书
 	certId, err := t.uploadCert()
 	if err != nil {
@@ -65,7 +64,6 @@ func (t *tencentCdn) Deploy(ctx context.Context) error {
 }

 func (t *tencentCdn) uploadCert() (string, error) {
-
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ssl.tencentcloudapi.com"

@@ -92,8 +90,6 @@ func (t *tencentCdn) deploy(certId string) error {
 	// 实例化要请求产品的client对象,clientProfile是可选的
 	client, _ := ssl.NewClient(t.credential, "", cpf)

-
-
 	// 实例化一个请求对象,每个接口都会对应一个request对象
 	request := ssl.NewDeployCertificateInstanceRequest()

@@ -102,7 +98,7 @@ func (t *tencentCdn) deploy(certId string) error {
 	request.Status = common.Int64Ptr(1)

 	// 如果是泛域名就从cdn列表下获取SSL证书中的可用域名
-	if(strings.Contains(t.option.Domain, "*")){
+	if strings.Contains(t.option.Domain, "*") {
 		list, errGetList := t.getDomainList()
 		if errGetList != nil {
 			return fmt.Errorf("failed to get certificate domain list: %w", errGetList)
@@ -111,13 +107,12 @@ func (t *tencentCdn) deploy(certId string) error {
 			return fmt.Errorf("failed to get certificate domain list: empty list.")
 		}
 		request.InstanceIdList = common.StringPtrs(list)
-	}else{ // 否则直接使用传入的域名
+	} else { // 否则直接使用传入的域名
 		request.InstanceIdList = common.StringPtrs([]string{t.option.Domain})
 	}

 	// 返回的resp是一个DeployCertificateInstanceResponse的实例，与请求对象对应
 	resp, err := client.DeployCertificateInstance(request)
-
 	if err != nil {
 		return fmt.Errorf("failed to deploy certificate: %w", err)
 	}
@@ -134,7 +129,6 @@ func (t *tencentCdn) getDomainList() ([]string, error) {

 	cert := base64.StdEncoding.EncodeToString([]byte(t.option.Certificate.Certificate))
 	request.Cert = &cert
-	

 	response, err := client.DescribeCertDomains(request)
 	if err != nil {
--- a/internal/deployer/webhook.go
+++ b/internal/deployer/webhook.go
@@ -2,11 +2,12 @@ package deployer

 import (
 	"bytes"
-	xhttp "certimate/internal/utils/http"
 	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
+
+	xhttp "certimate/internal/utils/http"
 )

 type webhookAccess struct {
@@ -26,7 +27,6 @@ type webhook struct {
 }

 func NewWebhook(option *DeployerOption) (Deployer, error) {
-
 	return &webhook{
 		option: option,
 		infos:  make([]string, 0),