diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index 5957fded..39b8a49f 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -24,6 +24,7 @@ import ( pAWSACM "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aws-acm" pAWSCloudFront "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/aws-cloudfront" pAzureKeyVault "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/azure-keyvault" + pBaiduCloudAppBLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-appblb" pBaiduCloudBLB "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-blb" pBaiduCloudCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-cdn" pBaishanCDN "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baishan-cdn" @@ -304,7 +305,7 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } } - case domain.DeployProviderTypeBaiduCloudBLB, domain.DeployProviderTypeBaiduCloudCDN: + case domain.DeployProviderTypeBaiduCloudAppBLB, domain.DeployProviderTypeBaiduCloudBLB, domain.DeployProviderTypeBaiduCloudCDN: { access := domain.AccessConfigForBaiduCloud{} if err := maputil.Populate(options.ProviderAccessConfig, &access); err != nil { @@ -312,6 +313,18 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } switch options.Provider { + case domain.DeployProviderTypeBaiduCloudAppBLB: + deployer, err := pBaiduCloudAppBLB.NewDeployer(&pBaiduCloudAppBLB.DeployerConfig{ + AccessKeyId: access.AccessKeyId, + SecretAccessKey: access.SecretAccessKey, + Region: maputil.GetString(options.ProviderDeployConfig, "region"), + ResourceType: pBaiduCloudAppBLB.ResourceType(maputil.GetString(options.ProviderDeployConfig, "resourceType")), + LoadbalancerId: maputil.GetString(options.ProviderDeployConfig, "loadbalancerId"), + ListenerPort: maputil.GetInt32(options.ProviderDeployConfig, "listenerPort"), + Domain: maputil.GetString(options.ProviderDeployConfig, "domain"), + }) + return deployer, err + case domain.DeployProviderTypeBaiduCloudBLB: deployer, err := pBaiduCloudBLB.NewDeployer(&pBaiduCloudBLB.DeployerConfig{ AccessKeyId: access.AccessKeyId, diff --git a/internal/domain/provider.go b/internal/domain/provider.go index 6cc229a1..79ee6709 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -135,6 +135,7 @@ const ( DeployProviderTypeAWSACM = DeployProviderType("aws-acm") DeployProviderTypeAWSCloudFront = DeployProviderType("aws-cloudfront") DeployProviderTypeAzureKeyVault = DeployProviderType("azure-keyvault") + DeployProviderTypeBaiduCloudAppBLB = DeployProviderType("baiducloud-appblb") DeployProviderTypeBaiduCloudBLB = DeployProviderType("baiducloud-blb") DeployProviderTypeBaiduCloudCDN = DeployProviderType("baiducloud-cdn") DeployProviderTypeBaishanCDN = DeployProviderType("baishan-cdn") diff --git a/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go b/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go new file mode 100644 index 00000000..c470bfcd --- /dev/null +++ b/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go @@ -0,0 +1,332 @@ +package baiducloudappblb + +import ( + "context" + "errors" + "fmt" + "log/slog" + "strconv" + "strings" + + bceappblb "github.com/baidubce/bce-sdk-go/services/appblb" + "github.com/google/uuid" + xerrors "github.com/pkg/errors" + + "github.com/usual2970/certimate/internal/pkg/core/deployer" + "github.com/usual2970/certimate/internal/pkg/core/uploader" + uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/baiducloud-cas" + "github.com/usual2970/certimate/internal/pkg/utils/sliceutil" +) + +type DeployerConfig struct { + // 百度智能云 AccessKeyId。 + AccessKeyId string `json:"accessKeyId"` + // 百度智能云 SecretAccessKey。 + SecretAccessKey string `json:"secretAccessKey"` + // 百度智能云区域。 + Region string `json:"region"` + // 部署资源类型。 + ResourceType ResourceType `json:"resourceType"` + // 负载均衡实例 ID。 + // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时必填。 + LoadbalancerId string `json:"loadbalancerId,omitempty"` + // 负载均衡监听端口。 + // 部署资源类型为 [RESOURCE_TYPE_LISTENER] 时必填。 + ListenerPort int32 `json:"listenerPort,omitempty"` + // SNI 域名（支持泛域名）。 + // 部署资源类型为 [RESOURCE_TYPE_LOADBALANCER]、[RESOURCE_TYPE_LISTENER] 时选填。 + Domain string `json:"domain,omitempty"` +} + +type DeployerProvider struct { + config *DeployerConfig + logger *slog.Logger + sdkClient *bceappblb.Client + sslUploader uploader.Uploader +} + +var _ deployer.Deployer = (*DeployerProvider)(nil) + +func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { + if config == nil { + panic("config is nil") + } + + client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create sdk client") + } + + uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ + AccessKeyId: config.AccessKeyId, + SecretAccessKey: config.SecretAccessKey, + }) + if err != nil { + return nil, xerrors.Wrap(err, "failed to create ssl uploader") + } + + return &DeployerProvider{ + config: config, + logger: slog.Default(), + sdkClient: client, + sslUploader: uploader, + }, nil +} + +func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { + if logger == nil { + d.logger = slog.Default() + } else { + d.logger = logger + } + return d +} + +func (d *DeployerProvider) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { + // 上传证书到 CAS + upres, err := d.sslUploader.Upload(ctx, certPem, privkeyPem) + if err != nil { + return nil, xerrors.Wrap(err, "failed to upload certificate file") + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) + } + + // 根据部署资源类型决定部署方式 + switch d.config.ResourceType { + case RESOURCE_TYPE_LOADBALANCER: + if err := d.deployToLoadbalancer(ctx, upres.CertId); err != nil { + return nil, err + } + + case RESOURCE_TYPE_LISTENER: + if err := d.deployToListener(ctx, upres.CertId); err != nil { + return nil, err + } + + default: + return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + } + + return &deployer.DeployResult{}, nil +} + +func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId string) error { + if d.config.LoadbalancerId == "" { + return errors.New("config `loadbalancerId` is required") + } + + // 查询 BLB 实例详情 + // REF: https://cloud.baidu.com/doc/BLB/s/6jwvxnyhi#describeloadbalancerdetail%E6%9F%A5%E8%AF%A2blb%E5%AE%9E%E4%BE%8B%E8%AF%A6%E6%83%85 + describeLoadBalancerDetailResp, err := d.sdkClient.DescribeLoadBalancerDetail(d.config.LoadbalancerId) + d.logger.Debug("sdk request 'appblb.DescribeLoadBalancerAttribute'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("response", describeLoadBalancerDetailResp)) + if err != nil { + return xerrors.Wrap(err, "failed to execute sdk request 'appblb.DescribeLoadBalancerDetail'") + } + + // 获取全部 HTTPS/SSL 监听端口 + listeners := make([]struct { + Type string + Port int32 + }, 0) + for _, listener := range describeLoadBalancerDetailResp.Listener { + if listener.Type == "HTTPS" || listener.Type == "SSL" { + listenerPort, err := strconv.Atoi(listener.Port) + if err != nil { + continue + } + + listeners = append(listeners, struct { + Type string + Port int32 + }{ + Type: listener.Type, + Port: int32(listenerPort), + }) + } + } + + // 遍历更新监听证书 + if len(listeners) == 0 { + d.logger.Info("no blb listeners to deploy") + } else { + d.logger.Info("found https/ssl listeners to deploy", slog.Any("listeners", listeners)) + var errs []error + + for _, listener := range listeners { + if err := d.updateListenerCertificate(ctx, d.config.LoadbalancerId, listener.Type, listener.Port, cloudCertId); err != nil { + errs = append(errs, err) + } + } + + if len(errs) > 0 { + return errors.Join(errs...) + } + } + + return nil +} + +func (d *DeployerProvider) deployToListener(ctx context.Context, cloudCertId string) error { + if d.config.LoadbalancerId == "" { + return errors.New("config `loadbalancerId` is required") + } + if d.config.ListenerPort == 0 { + return errors.New("config `listenerPort` is required") + } + + // 查询监听 + // REF: https://cloud.baidu.com/doc/BLB/s/ujwvxnyux#describeappalllisteners%E6%9F%A5%E8%AF%A2%E6%89%80%E6%9C%89%E7%9B%91%E5%90%AC + describeAppAllListenersRequest := &bceappblb.DescribeAppListenerArgs{ + ListenerPort: uint16(d.config.ListenerPort), + } + describeAppAllListenersResp, err := d.sdkClient.DescribeAppAllListeners(d.config.LoadbalancerId, describeAppAllListenersRequest) + d.logger.Debug("sdk request 'appblb.DescribeAppAllListeners'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("request", describeAppAllListenersRequest), slog.Any("response", describeAppAllListenersResp)) + if err != nil { + return xerrors.Wrap(err, "failed to execute sdk request 'appblb.DescribeAppAllListeners'") + } + + // 获取全部 HTTPS/SSL 监听端口 + listeners := make([]struct { + Type string + Port int32 + }, 0) + for _, listener := range describeAppAllListenersResp.ListenerList { + if listener.ListenerType == "HTTPS" || listener.ListenerType == "SSL" { + listeners = append(listeners, struct { + Type string + Port int32 + }{ + Type: listener.ListenerType, + Port: int32(listener.ListenerPort), + }) + } + } + + // 遍历更新监听证书 + if len(listeners) == 0 { + d.logger.Info("no blb listeners to deploy") + } else { + d.logger.Info("found https/ssl listeners to deploy", slog.Any("listeners", listeners)) + var errs []error + + for _, listener := range listeners { + if err := d.updateListenerCertificate(ctx, d.config.LoadbalancerId, listener.Type, listener.Port, cloudCertId); err != nil { + errs = append(errs, err) + } + } + + if len(errs) > 0 { + return errors.Join(errs...) + } + } + + return nil +} + +func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudLoadbalancerId string, cloudListenerType string, cloudListenerPort int32, cloudCertId string) error { + switch strings.ToUpper(cloudListenerType) { + case "HTTPS": + return d.updateHttpsListenerCertificate(ctx, cloudLoadbalancerId, cloudListenerPort, cloudCertId) + case "SSL": + return d.updateSslListenerCertificate(ctx, cloudLoadbalancerId, cloudListenerPort, cloudCertId) + default: + return fmt.Errorf("unsupported listener type: %s", cloudListenerType) + } +} + +func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, cloudLoadbalancerId string, cloudHttpsListenerPort int32, cloudCertId string) error { + // 查询 HTTPS 监听器 + // REF: https://cloud.baidu.com/doc/BLB/s/ujwvxnyux#describeapphttpslisteners%E6%9F%A5%E8%AF%A2https%E7%9B%91%E5%90%AC%E5%99%A8 + describeAppHTTPSListenersReq := &bceappblb.DescribeAppListenerArgs{ + ListenerPort: uint16(cloudHttpsListenerPort), + MaxKeys: 1, + } + describeAppHTTPSListenersResp, err := d.sdkClient.DescribeAppHTTPSListeners(cloudLoadbalancerId, describeAppHTTPSListenersReq) + d.logger.Debug("sdk request 'appblb.DescribeAppHTTPSListeners'", slog.String("blbId", cloudLoadbalancerId), slog.Any("request", describeAppHTTPSListenersReq), slog.Any("response", describeAppHTTPSListenersResp)) + if err != nil { + return xerrors.Wrap(err, "failed to execute sdk request 'appblb.DescribeAppHTTPSListeners'") + } else if len(describeAppHTTPSListenersResp.ListenerList) == 0 { + return fmt.Errorf("listener %s:%d not found", cloudLoadbalancerId, cloudHttpsListenerPort) + } + + if d.config.Domain == "" { + // 未指定 SNI，只需部署到监听器 + + // 更新 HTTPS 监听器 + // REF: https://cloud.baidu.com/doc/BLB/s/ujwvxnyux#updateapphttpslistener%E6%9B%B4%E6%96%B0https%E7%9B%91%E5%90%AC%E5%99%A8 + updateAppHTTPSListenerReq := &bceappblb.UpdateAppHTTPSListenerArgs{ + ClientToken: generateClientToken(), + ListenerPort: uint16(cloudHttpsListenerPort), + CertIds: []string{cloudCertId}, + } + err := d.sdkClient.UpdateAppHTTPSListener(cloudLoadbalancerId, updateAppHTTPSListenerReq) + d.logger.Debug("sdk request 'appblb.UpdateAppHTTPSListener'", slog.Any("request", updateAppHTTPSListenerReq)) + if err != nil { + return xerrors.Wrap(err, "failed to execute sdk request 'appblb.UpdateAppHTTPSListener'") + } + } else { + // 指定 SNI，需部署到扩展域名 + + // 更新 HTTPS 监听器 + // REF: https://cloud.baidu.com/doc/BLB/s/yjwvxnvl6#updatehttpslistener%E6%9B%B4%E6%96%B0https%E7%9B%91%E5%90%AC%E5%99%A8 + updateAppHTTPSListenerReq := &bceappblb.UpdateAppHTTPSListenerArgs{ + ClientToken: generateClientToken(), + ListenerPort: uint16(cloudHttpsListenerPort), + AdditionalCertDomains: sliceutil.Map(describeAppHTTPSListenersResp.ListenerList[0].AdditionalCertDomains, func(domain bceappblb.AdditionalCertDomainsModel) bceappblb.AdditionalCertDomainsModel { + if domain.Host == d.config.Domain { + return bceappblb.AdditionalCertDomainsModel{ + Host: domain.Host, + CertId: cloudCertId, + } + } + + return bceappblb.AdditionalCertDomainsModel{ + Host: domain.Host, + CertId: domain.CertId, + } + }), + } + err := d.sdkClient.UpdateAppHTTPSListener(cloudLoadbalancerId, updateAppHTTPSListenerReq) + d.logger.Debug("sdk request 'appblb.UpdateAppHTTPSListener'", slog.Any("request", updateAppHTTPSListenerReq)) + if err != nil { + return xerrors.Wrap(err, "failed to execute sdk request 'appblb.UpdateAppHTTPSListener'") + } + } + + return nil +} + +func (d *DeployerProvider) updateSslListenerCertificate(ctx context.Context, cloudLoadbalancerId string, cloudHttpsListenerPort int32, cloudCertId string) error { + // 更新 SSL 监听器 + // REF: https://cloud.baidu.com/doc/BLB/s/ujwvxnyux#updateappssllistener%E6%9B%B4%E6%96%B0ssl%E7%9B%91%E5%90%AC%E5%99%A8 + updateAppSSLListenerReq := &bceappblb.UpdateAppSSLListenerArgs{ + ClientToken: generateClientToken(), + ListenerPort: uint16(cloudHttpsListenerPort), + CertIds: []string{cloudCertId}, + } + err := d.sdkClient.UpdateAppSSLListener(cloudLoadbalancerId, updateAppSSLListenerReq) + d.logger.Debug("sdk request 'appblb.UpdateAppSSLListener'", slog.Any("request", updateAppSSLListenerReq)) + if err != nil { + return xerrors.Wrap(err, "failed to execute sdk request 'appblb.UpdateAppSSLListener'") + } + + return nil +} + +func createSdkClient(accessKeyId, secretAccessKey, region string) (*bceappblb.Client, error) { + endpoint := "" + if region != "" { + endpoint = fmt.Sprintf("blb.%s.baidubce.com", region) + } + + client, err := bceappblb.NewClient(accessKeyId, secretAccessKey, endpoint) + if err != nil { + return nil, err + } + + return client, nil +} + +func generateClientToken() string { + return strings.ReplaceAll(uuid.New().String(), "-", "") +} diff --git a/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go b/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go new file mode 100644 index 00000000..6753475c --- /dev/null +++ b/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb_test.go @@ -0,0 +1,86 @@ +package baiducloudappblb_test + +import ( + "context" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/usual2970/certimate/internal/pkg/core/deployer/providers/baiducloud-appblb" +) + +var ( + fInputCertPath string + fInputKeyPath string + fAccessKeyId string + fSecretAccessKey string + fRegion string + fLoadbalancerId string + fDomain string +) + +func init() { + argsPrefix := "CERTIMATE_DEPLOYER_BAIDUCLOUDAPPBLB_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fAccessKeyId, argsPrefix+"ACCESSKEYID", "", "") + flag.StringVar(&fSecretAccessKey, argsPrefix+"SECRETACCESSKEY", "", "") + flag.StringVar(&fRegion, argsPrefix+"REGION", "", "") + flag.StringVar(&fLoadbalancerId, argsPrefix+"LOADBALANCERID", "", "") + flag.StringVar(&fDomain, argsPrefix+"DOMAIN", "", "") +} + +/* +Shell command to run this test: + + go test -v ./baiducloud_appblb_test.go -args \ + --CERTIMATE_DEPLOYER_BAIDUCLOUDAPPBLB_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --CERTIMATE_DEPLOYER_BAIDUCLOUDAPPBLB_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --CERTIMATE_DEPLOYER_BAIDUCLOUDAPPBLB_ACCESSKEYID="your-access-key-id" \ + --CERTIMATE_DEPLOYER_BAIDUCLOUDAPPBLB_SECRETACCESSKEY="your-secret-access-key" \ + --CERTIMATE_DEPLOYER_BAIDUCLOUDAPPBLB_REGION="bj" \ + --CERTIMATE_DEPLOYER_BAIDUCLOUDAPPBLB_LOADBALANCERID="your-blb-loadbalancer-id" \ + --CERTIMATE_DEPLOYER_BAIDUCLOUDAPPBLB_DOMAIN="your-blb-sni-domain" +*/ +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("ACCESSKEYID: %v", fAccessKeyId), + fmt.Sprintf("SECRETACCESSKEY: %v", fSecretAccessKey), + fmt.Sprintf("REGION: %v", fRegion), + fmt.Sprintf("LOADBALANCERID: %v", fLoadbalancerId), + fmt.Sprintf("DOMAIN: %v", fDomain), + }, "\n")) + + deployer, err := provider.NewDeployer(&provider.DeployerConfig{ + AccessKeyId: fAccessKeyId, + SecretAccessKey: fSecretAccessKey, + ResourceType: provider.RESOURCE_TYPE_LOADBALANCER, + Region: fRegion, + LoadbalancerId: fLoadbalancerId, + 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) + }) +} diff --git a/internal/pkg/core/deployer/providers/baiducloud-appblb/consts.go b/internal/pkg/core/deployer/providers/baiducloud-appblb/consts.go new file mode 100644 index 00000000..3955f9a0 --- /dev/null +++ b/internal/pkg/core/deployer/providers/baiducloud-appblb/consts.go @@ -0,0 +1,10 @@ +package baiducloudappblb + +type ResourceType string + +const ( + // 资源类型：部署到指定负载均衡器。 + RESOURCE_TYPE_LOADBALANCER = ResourceType("loadbalancer") + // 资源类型：部署到指定监听器。 + RESOURCE_TYPE_LISTENER = ResourceType("listener") +) diff --git a/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go b/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go index 1c0fe371..c6b19da6 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go +++ b/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go @@ -9,6 +9,7 @@ import ( "strings" bceblb "github.com/baidubce/bce-sdk-go/services/blb" + "github.com/google/uuid" xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" @@ -254,6 +255,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c // 更新 HTTPS 监听器 // REF: https://cloud.baidu.com/doc/BLB/s/yjwvxnvl6#updatehttpslistener%E6%9B%B4%E6%96%B0https%E7%9B%91%E5%90%AC%E5%99%A8 updateHTTPSListenerReq := &bceblb.UpdateHTTPSListenerArgs{ + ClientToken: generateClientToken(), ListenerPort: uint16(cloudHttpsListenerPort), CertIds: []string{cloudCertId}, } @@ -268,6 +270,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c // 更新 HTTPS 监听器 // REF: https://cloud.baidu.com/doc/BLB/s/yjwvxnvl6#updatehttpslistener%E6%9B%B4%E6%96%B0https%E7%9B%91%E5%90%AC%E5%99%A8 updateHTTPSListenerReq := &bceblb.UpdateHTTPSListenerArgs{ + ClientToken: generateClientToken(), ListenerPort: uint16(cloudHttpsListenerPort), AdditionalCertDomains: sliceutil.Map(describeHTTPSListenersResp.ListenerList[0].AdditionalCertDomains, func(domain bceblb.AdditionalCertDomainsModel) bceblb.AdditionalCertDomainsModel { if domain.Host == d.config.Domain { @@ -297,6 +300,7 @@ func (d *DeployerProvider) updateSslListenerCertificate(ctx context.Context, clo // 更新 SSL 监听器 // REF: https://cloud.baidu.com/doc/BLB/s/yjwvxnvl6#updatessllistener%E6%9B%B4%E6%96%B0ssl%E7%9B%91%E5%90%AC%E5%99%A8 updateSSLListenerReq := &bceblb.UpdateSSLListenerArgs{ + ClientToken: generateClientToken(), ListenerPort: uint16(cloudHttpsListenerPort), CertIds: []string{cloudCertId}, } @@ -322,3 +326,7 @@ func createSdkClient(accessKeyId, secretAccessKey, region string) (*bceblb.Clien return client, nil } + +func generateClientToken() string { + return strings.ReplaceAll(uuid.New().String(), "-", "") +} diff --git a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx index 2ba13579..f1f6c6a0 100644 --- a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx +++ b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx @@ -33,6 +33,7 @@ import DeployNodeConfigFormAliyunWAFConfig from "./DeployNodeConfigFormAliyunWAF import DeployNodeConfigFormAWSACMConfig from "./DeployNodeConfigFormAWSACMConfig"; import DeployNodeConfigFormAWSCloudFrontConfig from "./DeployNodeConfigFormAWSCloudFrontConfig"; import DeployNodeConfigFormAzureKeyVaultConfig from "./DeployNodeConfigFormAzureKeyVaultConfig"; +import DeployNodeConfigFormBaiduCloudAppBLBConfig from "./DeployNodeConfigFormBaiduCloudAppBLBConfig"; import DeployNodeConfigFormBaiduCloudBLBConfig from "./DeployNodeConfigFormBaiduCloudBLBConfig"; import DeployNodeConfigFormBaiduCloudCDNConfig from "./DeployNodeConfigFormBaiduCloudCDNConfig"; import DeployNodeConfigFormBaishanCDNConfig from "./DeployNodeConfigFormBaishanCDNConfig"; @@ -186,6 +187,8 @@ const DeployNodeConfigForm = forwardRef; case DEPLOY_PROVIDERS.AZURE_KEYVAULT: return ; + case DEPLOY_PROVIDERS.BAIDUCLOUD_APPBLB: + return ; case DEPLOY_PROVIDERS.BAIDUCLOUD_BLB: return ; case DEPLOY_PROVIDERS.BAIDUCLOUD_CDN: diff --git a/ui/src/components/workflow/node/DeployNodeConfigFormBaiduCloudAppBLBConfig.tsx b/ui/src/components/workflow/node/DeployNodeConfigFormBaiduCloudAppBLBConfig.tsx new file mode 100644 index 00000000..157b9a27 --- /dev/null +++ b/ui/src/components/workflow/node/DeployNodeConfigFormBaiduCloudAppBLBConfig.tsx @@ -0,0 +1,142 @@ +import { useTranslation } from "react-i18next"; +import { Form, type FormInstance, Input, Select } from "antd"; +import { createSchemaFieldRule } from "antd-zod"; +import { z } from "zod"; + +import Show from "@/components/Show"; +import { validDomainName, validPortNumber } from "@/utils/validators"; + +type DeployNodeConfigFormBaiduCloudAppBLBConfigFieldValues = Nullish<{ + resourceType: string; + region: string; + loadbalancerId?: string; + listenerPort?: string | number; + domain?: string; +}>; + +export type DeployNodeConfigFormBaiduCloudAppBLBConfigProps = { + form: FormInstance; + formName: string; + disabled?: boolean; + initialValues?: DeployNodeConfigFormBaiduCloudAppBLBConfigFieldValues; + onValuesChange?: (values: DeployNodeConfigFormBaiduCloudAppBLBConfigFieldValues) => void; +}; + +const RESOURCE_TYPE_LOADBALANCER = "loadbalancer" as const; +const RESOURCE_TYPE_LISTENER = "listener" as const; + +const initFormModel = (): DeployNodeConfigFormBaiduCloudAppBLBConfigFieldValues => { + return { + listenerPort: 443, + }; +}; + +const DeployNodeConfigFormBaiduCloudAppBLBConfig = ({ + form: formInst, + formName, + disabled, + initialValues, + onValuesChange, +}: DeployNodeConfigFormBaiduCloudAppBLBConfigProps) => { + const { t } = useTranslation(); + + const formSchema = z.object({ + resourceType: z.union([z.literal(RESOURCE_TYPE_LOADBALANCER), z.literal(RESOURCE_TYPE_LISTENER)], { + message: t("workflow_node.deploy.form.baiducloud_appblb_resource_type.placeholder"), + }), + region: z + .string({ message: t("workflow_node.deploy.form.baiducloud_appblb_region.placeholder") }) + .nonempty(t("workflow_node.deploy.form.baiducloud_appblb_region.placeholder")) + .trim(), + loadbalancerId: z + .string({ message: t("workflow_node.deploy.form.baiducloud_appblb_loadbalancer_id.placeholder") }) + .min(1, t("workflow_node.deploy.form.baiducloud_appblb_loadbalancer_id.placeholder")) + .max(64, t("common.errmsg.string_max", { max: 64 })) + .trim(), + listenerPort: z + .union([z.number(), z.string()]) + .refine( + (v) => fieldResourceType === RESOURCE_TYPE_LISTENER && validPortNumber(v), + t("workflow_node.deploy.form.baiducloud_appblb_listener_port.placeholder") + ) + .nullish(), + domain: z + .string() + .nullish() + .refine((v) => { + if (![RESOURCE_TYPE_LOADBALANCER, RESOURCE_TYPE_LISTENER].includes(fieldResourceType)) return true; + return !v || validDomainName(v!, { allowWildcard: true }); + }, t("common.errmsg.domain_invalid")), + }); + const formRule = createSchemaFieldRule(formSchema); + + const fieldResourceType = Form.useWatch("resourceType", formInst); + + const handleFormChange = (_: unknown, values: z.infer) => { + onValuesChange?.(values); + }; + + return ( +
+ + + + + } + > + + + + } + > + + + + + } + > + + + + + + } + > + + + +
+ ); +}; + +export default DeployNodeConfigFormBaiduCloudAppBLBConfig; diff --git a/ui/src/domain/provider.ts b/ui/src/domain/provider.ts index 37c4bc00..088a2d62 100644 --- a/ui/src/domain/provider.ts +++ b/ui/src/domain/provider.ts @@ -249,6 +249,7 @@ export const DEPLOY_PROVIDERS = Object.freeze({ AWS_ACM: `${ACCESS_PROVIDERS.AWS}-acm`, AWS_CLOUDFRONT: `${ACCESS_PROVIDERS.AWS}-cloudfront`, AZURE_KEYVAULT: `${ACCESS_PROVIDERS.AZURE}-keyvault`, + BAIDUCLOUD_APPBLB: `${ACCESS_PROVIDERS.BAIDUCLOUD}-appblb`, BAIDUCLOUD_BLB: `${ACCESS_PROVIDERS.BAIDUCLOUD}-blb`, BAIDUCLOUD_CDN: `${ACCESS_PROVIDERS.BAIDUCLOUD}-cdn`, BAISHAN_CDN: `${ACCESS_PROVIDERS.BAISHAN}-cdn`, @@ -362,6 +363,7 @@ export const deployProvidersMap: Maphttps://learn.microsoft.com/en-us/azure/key-vault/general/about-keys-secrets-certificates", + "workflow_node.deploy.form.baiducloud_appblb_resource_type.label": "Resource type", + "workflow_node.deploy.form.baiducloud_appblb_resource_type.placeholder": "Please select resource type", + "workflow_node.deploy.form.baiducloud_appblb_resource_type.option.loadbalancer.label": "BLB load balancer", + "workflow_node.deploy.form.baiducloud_appblb_resource_type.option.listener.label": "BLB listener", + "workflow_node.deploy.form.baiducloud_appblb_region.label": "Baidu Cloud BLB region", + "workflow_node.deploy.form.baiducloud_appblb_region.placeholder": "Please enter Baidu Cloud BLB region (e.g. bj)", + "workflow_node.deploy.form.baiducloud_appblb_region.tooltip": "For more information, see https://cloud.baidu.com/doc/BLB/s/cjwvxnzix", + "workflow_node.deploy.form.baiducloud_appblb_loadbalancer_id.label": "Baidu Cloud BLB load balancer ID", + "workflow_node.deploy.form.baiducloud_appblb_loadbalancer_id.placeholder": "Please enter Baidu Cloud BLB load balancer ID", + "workflow_node.deploy.form.baiducloud_appblb_loadbalancer_id.tooltip": "For more information, see https://console.bce.baidu.com/blb/#/appblb/list", + "workflow_node.deploy.form.baiducloud_appblb_listener_port.label": "Baidu Cloud BLB listener port", + "workflow_node.deploy.form.baiducloud_appblb_listener_port.placeholder": "Please enter Baidu Cloud BLB listener port", + "workflow_node.deploy.form.baiducloud_appblb_listener_port.tooltip": "For more information, see https://console.bce.baidu.com/blb/#/appblb/list", + "workflow_node.deploy.form.baiducloud_appblb_snidomain.label": "Baidu Cloud BLB SNI domain (Optional)", + "workflow_node.deploy.form.baiducloud_appblb_snidomain.placeholder": "Please enter Baidu Cloud BLB SNI domain name", + "workflow_node.deploy.form.baiducloud_appblb_snidomain.tooltip": "For more information, see https://console.bce.baidu.com/blb/#/appblb/list", "workflow_node.deploy.form.baiducloud_blb_resource_type.label": "Resource type", "workflow_node.deploy.form.baiducloud_blb_resource_type.placeholder": "Please select resource type", "workflow_node.deploy.form.baiducloud_blb_resource_type.option.loadbalancer.label": "BLB load balancer", diff --git a/ui/src/i18n/locales/zh/nls.provider.json b/ui/src/i18n/locales/zh/nls.provider.json index acee7a7b..ae30c2a6 100644 --- a/ui/src/i18n/locales/zh/nls.provider.json +++ b/ui/src/i18n/locales/zh/nls.provider.json @@ -28,6 +28,7 @@ "provider.azure.dns": "Azure - DNS", "provider.azure.keyvault": "Azure - KeyVault", "provider.baiducloud": "百度智能云", + "provider.baiducloud.appblb": "百度智能云 - 应用型负载均衡 BLB", "provider.baiducloud.blb": "百度智能云 - 普通型负载均衡 BLB", "provider.baiducloud.cdn": "百度智能云 - 内容分发网络 CDN", "provider.baiducloud.dns": "百度智能云 - 智能云解析 DNS", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 05868ff3..715efd41 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -222,6 +222,22 @@ "workflow_node.deploy.form.azure_keyvault_name.label": "Azure KeyVault 名称", "workflow_node.deploy.form.azure_keyvault_name.placeholder": "请输入 Azure KeyVault 名称", "workflow_node.deploy.form.azure_keyvault_name.tooltip": "这是什么？请参阅 https://learn.microsoft.com/zh-cn/azure/key-vault/general/about-keys-secrets-certificates", + "workflow_node.deploy.form.baiducloud_appblb_resource_type.label": "证书替换方式", + "workflow_node.deploy.form.baiducloud_appblb_resource_type.placeholder": "请选择证书替换方式", + "workflow_node.deploy.form.baiducloud_appblb_resource_type.option.loadbalancer.label": "替换指定负载均衡器下的全部 HTTPS/SSL 监听的证书", + "workflow_node.deploy.form.baiducloud_appblb_resource_type.option.listener.label": "替换指定负载均衡监听的证书", + "workflow_node.deploy.form.baiducloud_appblb_region.label": "百度智能云 BLB 服务地域", + "workflow_node.deploy.form.baiducloud_appblb_region.placeholder": "请输入百度智能云 BLB 服务地域（例如：bj）", + "workflow_node.deploy.form.baiducloud_appblb_region.tooltip": "这是什么？请参阅 https://cloud.baidu.com/doc/BLB/s/cjwvxnzix", + "workflow_node.deploy.form.baiducloud_appblb_loadbalancer_id.label": "百度智能云 BLB 负载均衡器 ID", + "workflow_node.deploy.form.baiducloud_appblb_loadbalancer_id.placeholder": "请输入百度智能云 BLB 负载均衡器 ID", + "workflow_node.deploy.form.baiducloud_appblb_loadbalancer_id.tooltip": "这是什么？请参阅 https://console.bce.baidu.com/blb/#/appblb/list", + "workflow_node.deploy.form.baiducloud_appblb_listener_port.label": "百度智能云 BLB 监听端口", + "workflow_node.deploy.form.baiducloud_appblb_listener_port.placeholder": "请输入百度智能云 BLB 监听端口", + "workflow_node.deploy.form.baiducloud_appblb_listener_port.tooltip": "这是什么？请参阅 https://console.bce.baidu.com/blb/#/appblb/list", + "workflow_node.deploy.form.baiducloud_appblb_snidomain.label": "百度智能云 BLB 扩展域名（可选）", + "workflow_node.deploy.form.baiducloud_appblb_snidomain.placeholder": "请输入百度智能云 BLB 扩展域名（支持泛域名）", + "workflow_node.deploy.form.baiducloud_appblb_snidomain.tooltip": "这是什么？请参阅 https://console.bce.baidu.com/blb/#/appblb/list

不填写时，将替换监听器的默认证书。", "workflow_node.deploy.form.baiducloud_blb_resource_type.label": "证书替换方式", "workflow_node.deploy.form.baiducloud_blb_resource_type.placeholder": "请选择证书替换方式", "workflow_node.deploy.form.baiducloud_blb_resource_type.option.loadbalancer.label": "替换指定负载均衡器下的全部 HTTPS/SSL 监听的证书",