feat: add ucloud us3 deployer

internal/deployer/providers.go

@@ -28,6 +28,7 @@ import (
 	providerTencentCloudECDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-ecdn"
 	providerTencentCloudEO "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/tencentcloud-eo"
 	providerUCloudUCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ucloud-ucdn"
+	providerUCloudUS3 "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ucloud-us3"
 	providerVolcEngineCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-cdn"
 	providerVolcEngineCLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-clb"
 	providerVolcEngineDCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/volcengine-dcdn"
@@ -353,7 +354,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, logger.Logger,
 			}
 		}
 
-	case domain.DeployProviderTypeUCloudUCDN:
+	case domain.DeployProviderTypeUCloudUCDN, domain.DeployProviderTypeUCloudUS3:
 		{
 			access := domain.AccessConfigForUCloud{}
 			if err := maps.Decode(options.ProviderAccessConfig, &access); err != nil {
@@ -365,11 +366,22 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, logger.Logger,
 				deployer, err := providerUCloudUCDN.NewWithLogger(&providerUCloudUCDN.UCloudUCDNDeployerConfig{
 					PrivateKey: access.PrivateKey,
 					PublicKey:  access.PublicKey,
-					ProjectId:  maps.GetValueAsString(options.ProviderDeployConfig, "projectId"),
+					ProjectId:  access.ProjectId,
 					DomainId:   maps.GetValueAsString(options.ProviderDeployConfig, "domainId"),
 				}, logger)
 				return deployer, logger, err
 
+			case domain.DeployProviderTypeUCloudUS3:
+				deployer, err := providerUCloudUS3.NewWithLogger(&providerUCloudUS3.UCloudUS3DeployerConfig{
+					PrivateKey: access.PrivateKey,
+					PublicKey:  access.PublicKey,
+					ProjectId:  access.ProjectId,
+					Region:     maps.GetValueAsString(options.ProviderDeployConfig, "region"),
+					Bucket:     maps.GetValueAsString(options.ProviderDeployConfig, "bucket"),
+					Domain:     maps.GetValueAsString(options.ProviderDeployConfig, "domain"),
+				}, logger)
+				return deployer, logger, err
+
 			default:
 				break
 			}

internal/domain/access.go

@@ -25,9 +25,9 @@ func (a *Access) UnmarshalConfigToMap() (map[string]any, error) {
 
 type AccessConfigForACMEHttpReq struct {
 	Endpoint string `json:"endpoint"`
-	Mode     string `json:"mode"`
-	Username string `json:"username"`
-	Password string `json:"password"`
+	Mode     string `json:"mode,omitempty"`
+	Username string `json:"username,omitempty"`
+	Password string `json:"password,omitempty"`
 }
 
 type AccessConfigForAliyun struct {
@@ -79,7 +79,7 @@ type AccessConfigForHuaweiCloud struct {
 type AccessConfigForLocal struct{}
 
 type AccessConfigForKubernetes struct {
-	KubeConfig string `json:"kubeConfig"`
+	KubeConfig string `json:"kubeConfig,omitempty"`
 }
 
 type AccessConfigForNameDotCom struct {
@@ -105,9 +105,9 @@ type AccessConfigForSSH struct {
 	Host          string `json:"host"`
 	Port          int32  `json:"port"`
 	Username      string `json:"username"`
-	Password      string `json:"password"`
-	Key           string `json:"key"`
-	KeyPassphrase string `json:"keyPassphrase"`
+	Password      string `json:"password,omitempty"`
+	Key           string `json:"key,omitempty"`
+	KeyPassphrase string `json:"keyPassphrase,omitempty"`
 }
 
 type AccessConfigForTencentCloud struct {
@@ -118,6 +118,7 @@ type AccessConfigForTencentCloud struct {
 type AccessConfigForUCloud struct {
 	PrivateKey string `json:"privateKey"`
 	PublicKey  string `json:"publicKey"`
+	ProjectId  string `json:"projectId,omitempty"`
 }
 
 type AccessConfigForVolcEngine struct {

internal/domain/provider.go

@@ -94,6 +94,7 @@ const (
 	DeployProviderTypeTencentCloudECDN = DeployProviderType("tencentcloud-ecdn")
 	DeployProviderTypeTencentCloudEO   = DeployProviderType("tencentcloud-eo")
 	DeployProviderTypeUCloudUCDN       = DeployProviderType("ucloud-ucdn")
+	DeployProviderTypeUCloudUS3        = DeployProviderType("ucloud-us3")
 	DeployProviderTypeVolcEngineCDN    = DeployProviderType("volcengine-cdn")
 	DeployProviderTypeVolcEngineCLB    = DeployProviderType("volcengine-clb")
 	DeployProviderTypeVolcEngineDCDN   = DeployProviderType("volcengine-dcdn")

internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn_test.go

@@ -20,7 +20,7 @@ var (
 )
 
 func init() {
-	argsPrefix := "CERTIMATE_DEPLOYER_UCLOUDCDN_"
+	argsPrefix := "CERTIMATE_DEPLOYER_UCLOUDUCDN_"
 
 	flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "")
 	flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "")
@@ -32,12 +32,12 @@ func init() {
 /*
 Shell command to run this test:
 
-	go test -v ./ucloud_cdn_test.go -args \
-	--CERTIMATE_DEPLOYER_UCLOUDCDN_INPUTCERTPATH="/path/to/your-input-cert.pem" \
-	--CERTIMATE_DEPLOYER_UCLOUDCDN_INPUTKEYPATH="/path/to/your-input-key.pem" \
-	--CERTIMATE_DEPLOYER_UCLOUDCDN_PRIVATEKEY="your-private-key" \
-	--CERTIMATE_DEPLOYER_UCLOUDCDN_PUBLICKEY="your-public-key" \
-	--CERTIMATE_DEPLOYER_UCLOUDCDN_DOMAINID="your-domain-id"
+	go test -v ./ucloud_ucdn_test.go -args \
+	--CERTIMATE_DEPLOYER_UCLOUDUCDN_INPUTCERTPATH="/path/to/your-input-cert.pem" \
+	--CERTIMATE_DEPLOYER_UCLOUDUCDN_INPUTKEYPATH="/path/to/your-input-key.pem" \
+	--CERTIMATE_DEPLOYER_UCLOUDUCDN_PRIVATEKEY="your-private-key" \
+	--CERTIMATE_DEPLOYER_UCLOUDUCDN_PUBLICKEY="your-public-key" \
+	--CERTIMATE_DEPLOYER_UCLOUDUCDN_DOMAINID="your-domain-id"
 */
 func TestDeploy(t *testing.T) {
 	flag.Parse()
@@ -53,9 +53,9 @@ func TestDeploy(t *testing.T) {
 		}, "\n"))
 
 		deployer, err := provider.New(&provider.UCloudUCDNDeployerConfig{
-			AccessKeyId:     fPrivateKey,
-			AccessKeySecret: fPublicKey,
-			DomainId:        fDomainId,
+			PrivateKey: fPrivateKey,
+			PublicKey:  fPublicKey,
+			DomainId:   fDomainId,
 		})
 		if err != nil {
 			t.Errorf("err: %+v", err)

internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go

@@ -0,0 +1,116 @@
+package ucloudus3
+
+import (
+	"context"
+	"errors"
+
+	xerrors "github.com/pkg/errors"
+	usdk "github.com/ucloud/ucloud-sdk-go/ucloud"
+	uAuth "github.com/ucloud/ucloud-sdk-go/ucloud/auth"
+
+	"github.com/usual2970/certimate/internal/pkg/core/deployer"
+	"github.com/usual2970/certimate/internal/pkg/core/logger"
+	"github.com/usual2970/certimate/internal/pkg/core/uploader"
+	uploaderSsl "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/ucloud-ussl"
+	usdkFile "github.com/usual2970/certimate/internal/pkg/vendors/ucloud-sdk/ufile"
+)
+
+type UCloudUS3DeployerConfig struct {
+	// 优刻得 API 私钥。
+	PrivateKey string `json:"privateKey"`
+	// 优刻得 API 公钥。
+	PublicKey string `json:"publicKey"`
+	// 优刻得项目 ID。
+	ProjectId string `json:"projectId,omitempty"`
+	// 优刻得地域。
+	Region string `json:"region"`
+	// 存储桶名。
+	Bucket string `json:"bucket"`
+	// 自定义域名（不支持泛域名）。
+	Domain string `json:"domain"`
+}
+
+type UCloudUS3Deployer struct {
+	config      *UCloudUS3DeployerConfig
+	logger      logger.Logger
+	sdkClient   *usdkFile.UFileClient
+	sslUploader uploader.Uploader
+}
+
+var _ deployer.Deployer = (*UCloudUS3Deployer)(nil)
+
+func New(config *UCloudUS3DeployerConfig) (*UCloudUS3Deployer, error) {
+	return NewWithLogger(config, logger.NewNilLogger())
+}
+
+func NewWithLogger(config *UCloudUS3DeployerConfig, logger logger.Logger) (*UCloudUS3Deployer, error) {
+	if config == nil {
+		return nil, errors.New("config is nil")
+	}
+
+	if logger == nil {
+		return nil, errors.New("logger is nil")
+	}
+
+	client, err := createSdkClient(config.PrivateKey, config.PublicKey, config.Region)
+	if err != nil {
+		return nil, xerrors.Wrap(err, "failed to create sdk client")
+	}
+
+	uploader, err := uploaderSsl.New(&uploaderSsl.UCloudUSSLUploaderConfig{
+		PrivateKey: config.PrivateKey,
+		PublicKey:  config.PublicKey,
+		ProjectId:  config.ProjectId,
+	})
+	if err != nil {
+		return nil, xerrors.Wrap(err, "failed to create ssl uploader")
+	}
+
+	return &UCloudUS3Deployer{
+		logger:      logger,
+		config:      config,
+		sdkClient:   client,
+		sslUploader: uploader,
+	}, nil
+}
+
+func (d *UCloudUS3Deployer) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) {
+	// 上传证书到 USSL
+	upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem)
+	if err != nil {
+		return nil, xerrors.Wrap(err, "failed to upload certificate file")
+	}
+
+	d.logger.Logt("certificate file uploaded", upres)
+
+	// 添加 SSL 证书
+	// REF: https://docs.ucloud.cn/api/ufile-api/add_ufile_ssl_cert
+	addUFileSSLCertReq := d.sdkClient.NewAddUFileSSLCertRequest()
+	addUFileSSLCertReq.BucketName = usdk.String(d.config.Bucket)
+	addUFileSSLCertReq.Domain = usdk.String(d.config.Domain)
+	addUFileSSLCertReq.USSLId = usdk.String(upres.CertId)
+	addUFileSSLCertReq.CertificateName = usdk.String(upres.CertName)
+	if d.config.ProjectId != "" {
+		addUFileSSLCertReq.ProjectId = usdk.String(d.config.ProjectId)
+	}
+	addUFileSSLCertResp, err := d.sdkClient.AddUFileSSLCert(addUFileSSLCertReq)
+	if err != nil {
+		return nil, xerrors.Wrap(err, "failed to execute sdk request 'ucdn.AddUFileSSLCert'")
+	}
+
+	d.logger.Logt("添加 SSL 证书", addUFileSSLCertResp)
+
+	return &deployer.DeployResult{}, nil
+}
+
+func createSdkClient(privateKey, publicKey, region string) (*usdkFile.UFileClient, error) {
+	cfg := usdk.NewConfig()
+	cfg.Region = region
+
+	credential := uAuth.NewCredential()
+	credential.PrivateKey = privateKey
+	credential.PublicKey = publicKey
+
+	client := usdkFile.NewClient(&cfg, &credential)
+	return client, nil
+}

internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3_test.go

@@ -0,0 +1,85 @@
+package ucloudus3_test
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+	"testing"
+
+	provider "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/ucloud-us3"
+)
+
+var (
+	fInputCertPath string
+	fInputKeyPath  string
+	fPrivateKey    string
+	fPublicKey     string
+	fRegion        string
+	fBucket        string
+	fDomain        string
+)
+
+func init() {
+	argsPrefix := "CERTIMATE_DEPLOYER_UCLOUDUS3_"
+
+	flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "")
+	flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "")
+	flag.StringVar(&fPrivateKey, argsPrefix+"PRIVATEKEY", "", "")
+	flag.StringVar(&fPublicKey, argsPrefix+"PUBLICKEY", "", "")
+	flag.StringVar(&fRegion, argsPrefix+"REGION", "", "")
+	flag.StringVar(&fBucket, argsPrefix+"BUCKET", "", "")
+	flag.StringVar(&fDomain, argsPrefix+"DOMAIN", "", "")
+}
+
+/*
+Shell command to run this test:
+
+	go test -v ./ucloud_us3_test.go -args \
+	--CERTIMATE_DEPLOYER_UCLOUDUS3_INPUTCERTPATH="/path/to/your-input-cert.pem" \
+	--CERTIMATE_DEPLOYER_UCLOUDUS3_INPUTKEYPATH="/path/to/your-input-key.pem" \
+	--CERTIMATE_DEPLOYER_UCLOUDUS3_PRIVATEKEY="your-private-key" \
+	--CERTIMATE_DEPLOYER_UCLOUDUS3_PUBLICKEY="your-public-key" \
+	--CERTIMATE_DEPLOYER_UCLOUDUS3_REGION="cn-bj2" \
+	--CERTIMATE_DEPLOYER_UCLOUDUS3_BUCKET="your-us3-bucket" \
+	--CERTIMATE_DEPLOYER_UCLOUDUS3_DOMAIN="example.com"
+*/
+func TestDeploy(t *testing.T) {
+	flag.Parse()
+
+	t.Run("Deploy", func(t *testing.T) {
+		t.Log(strings.Join([]string{
+			"args:",
+			fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath),
+			fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath),
+			fmt.Sprintf("PRIVATEKEY: %v", fPrivateKey),
+			fmt.Sprintf("PUBLICKEY: %v", fPublicKey),
+			fmt.Sprintf("REGION: %v", fRegion),
+			fmt.Sprintf("BUCKET: %v", fBucket),
+			fmt.Sprintf("DOMAIN: %v", fDomain),
+		}, "\n"))
+
+		deployer, err := provider.New(&provider.UCloudUS3DeployerConfig{
+			PrivateKey: fPrivateKey,
+			PublicKey:  fPublicKey,
+			Region:     fRegion,
+			Bucket:     fBucket,
+			Domain:     fDomain,
+		})
+		if err != nil {
+			t.Errorf("err: %+v", err)
+			return
+		}
+
+		fInputCertData, _ := os.ReadFile(fInputCertPath)
+		fInputKeyData, _ := os.ReadFile(fInputKeyPath)
+		res, err := deployer.Deploy(context.Background(), string(fInputCertData), string(fInputKeyData))
+		if err != nil {
+			t.Errorf("err: %+v", err)
+			return
+		}
+
+		t.Logf("ok: %v", res)
+	})
+}

internal/pkg/vendors/ucloud-sdk/ufile/apis.go

@@ -0,0 +1,42 @@
+package ufile
+
+import (
+	"github.com/ucloud/ucloud-sdk-go/ucloud/request"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/response"
+)
+
+type AddUFileSSLCertRequest struct {
+	request.CommonBase
+
+	BucketName      *string `required:"true"`
+	Domain          *string `required:"true"`
+	CertificateName *string `required:"true"`
+	USSLId          *string `required:"false"`
+}
+
+type AddUFileSSLCertResponse struct {
+	response.CommonBase
+}
+
+func (c *UFileClient) NewAddUFileSSLCertRequest() *AddUFileSSLCertRequest {
+	req := &AddUFileSSLCertRequest{}
+
+	c.Client.SetupRequest(req)
+
+	req.SetRetryable(false)
+	return req
+}
+
+func (c *UFileClient) AddUFileSSLCert(req *AddUFileSSLCertRequest) (*AddUFileSSLCertResponse, error) {
+	var err error
+	var res AddUFileSSLCertResponse
+
+	reqCopier := *req
+
+	err = c.Client.InvokeAction("AddUFileSSLCert", &reqCopier, &res)
+	if err != nil {
+		return &res, err
+	}
+
+	return &res, nil
+}

internal/pkg/vendors/ucloud-sdk/ufile/client.go

@@ -0,0 +1,18 @@
+package ufile
+
+import (
+	"github.com/ucloud/ucloud-sdk-go/ucloud"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/auth"
+)
+
+type UFileClient struct {
+	*ucloud.Client
+}
+
+func NewClient(config *ucloud.Config, credential *auth.Credential) *UFileClient {
+	meta := ucloud.ClientMeta{Product: "UFile"}
+	client := ucloud.NewClientWithMeta(config, credential, meta)
+	return &UFileClient{
+		client,
+	}
+}